summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-12-07 19:44:30 -0700
committerIra Rice <irarice@gmail.com>2008-12-07 19:44:30 -0700
commit3aca1f5b4f11a3bb90ecacfb43346a1e2832397d (patch)
tree0502d14866767d64ef3e9a89e05a16fda04a7399 /README
parentaef082e6fe4fca268f9bfe401409eb342f82e4af (diff)
downloadmana-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 'README')
-rw-r--r--README6
1 files changed, 1 insertions, 5 deletions
diff --git a/README b/README
index e5053509..6e31ab6e 100644
--- a/README
+++ b/README
@@ -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