| author | mickeyl <mickeyl> | 2003-11-03 23:05:29 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-11-03 23:05:29 (UTC) |
| commit | 8046118c7d4def83ef1a70628870b5ebad0534a4 (patch) (unidiff) | |
| tree | 21f03403f1f4d42d72eace822511e084580a8772 /noncore/games/tictac/main.cpp | |
| parent | 7f34e7b45108c353e0a2575153904ce655cb1896 (diff) | |
| download | opie-8046118c7d4def83ef1a70628870b5ebad0534a4.zip opie-8046118c7d4def83ef1a70628870b5ebad0534a4.tar.gz opie-8046118c7d4def83ef1a70628870b5ebad0534a4.tar.bz2 | |
noncore/games/tictac now fully merged
| -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,13 +1,7 @@ | |||
| 1 | /**************************************************************************** | 1 | /**************************************************************************** |
| 2 | <<<<<<< main.cpp | ||
| 3 | ** $Id$ | ||
| 4 | ======= | ||
| 5 | ** $Id$ | ||
| 6 | >>>>>>> 1.1.8.1.2.1 | ||
| 7 | ** | ||
| 8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. |
| 9 | ** | 3 | ** |
| 10 | ** This file is part of an example program for Qt. This example | 4 | ** This file is part of an example program for Qt. This example |
| 11 | ** program may be used, distributed and modified without limitation. | 5 | ** program may be used, distributed and modified without limitation. |
| 12 | ** | 6 | ** |
| 13 | *****************************************************************************/ | 7 | *****************************************************************************/ |