summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
commitd14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch)
tree5f128768c66436eefd70632f02889607596609d4 /README
parentf1e92aca00a4859047e83fab76220767b9a2f814 (diff)
parente93e6beb456d105987da3190c2a80847b6900081 (diff)
downloadplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz
plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2
plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz
plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index 6956d4ef0..ad106569c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.1.10.2 Date: 2011-10-02
+ Version: 1.1.10.16 Date: 2011-10-16
Development team:
- See AUTHORS file for a list