diff options
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ac227410..afcca24b 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,9 @@ 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 |