diff options
| author | Ira Rice <irarice@gmail.com> | 2008-12-07 19:44:30 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-12-07 19:44:30 -0700 |
| commit | 3aca1f5b4f11a3bb90ecacfb43346a1e2832397d (patch) | |
| tree | 0502d14866767d64ef3e9a89e05a16fda04a7399 /CMakeLists.txt | |
| parent | aef082e6fe4fca268f9bfe401409eb342f82e4af (diff) | |
| download | Mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.tar.gz Mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.tar.bz2 Mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.tar.xz Mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.zip | |
Fixed a few files that apparently weren't updated.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 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) |