Diffstat (limited to 'noncore/games/tictac/main.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/games/tictac/main.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp index 0185b8c..cfff683 100644 --- a/noncore/games/tictac/main.cpp +++ b/noncore/games/tictac/main.cpp @@ -1,10 +1,4 @@ /**************************************************************************** -<<<<<<< main.cpp -** $Id$ -======= -** $Id$ ->>>>>>> 1.1.8.1.2.1 -** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example |