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 /configure.ac | |
| 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 'configure.ac')
| -rwxr-xr-x | configure.ac | 4 |
1 files changed, 0 insertions, 4 deletions
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 |