diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | The Mana World.icns | bin | 65136 -> 0 bytes | |||
| -rwxr-xr-x | configure.ac | 4 |
5 files changed, 1 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index afc6ab69..7ac379de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,6 @@ PROJECT(AETHYRA) -<<<<<<< HEAD:CMakeLists.txt SET(VERSION 0.0.27) -======= -SET(VERSION 0.0.26) ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:CMakeLists.txt # where to look for cmake modules SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) @@ -1,4 +1,3 @@ -<<<<<<< HEAD:ChangeLog 2008-11-01 Bjørn Lindeijer <bjorn@lindeijer.nl> * src/openglgraphics.h, src/openglgraphics.cpp: Made an option around @@ -6143,5 +6142,3 @@ window a shorter. * data/graphics/images/login_wallpaper.png: New login wallpaper by Momotaro. -======= ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:ChangeLog @@ -1,11 +1,7 @@ AETHYRA =================== -<<<<<<< HEAD:README - Version: 0.0.25 Date: 9/16/2008 -======= - Version: 0.0.26 Date: 29/8/2008 ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:README + Version: 0.0.27 Date: 12/07/2008 Development team: - See AUTHORS file for a list diff --git a/The Mana World.icns b/The Mana World.icns Binary files differdeleted file mode 100644 index 7230a099..00000000 --- a/The Mana World.icns +++ /dev/null diff --git a/configure.ac b/configure.ac index afcca24b..ac227410 100755 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,5 @@ AC_PREREQ(2.59) -<<<<<<< HEAD:configure.ac AC_INIT([Aethyra], [SVN-0.0.27], [irarice@gmail.com], [aethyra]) -======= -AC_INIT([The Mana World], [0.0.26], [elvenprogrammer@gmail.com], [tmw]) ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:configure.ac AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS |