summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-06-13 13:16:16 -0600
committerJared Adams <jaxad0127@gmail.com>2010-06-13 13:16:16 -0600
commite8bea8a6edf69e824a922adeb5e697111ceabe90 (patch)
treedb1937956bc585b300f2a2c8312af4ad5bf924de /NEWS
parent593fd2b831304c8e421589aab0fb158e4b7e9c35 (diff)
parent0b15a3ad32838134384524ce4af95d65b0b4e5da (diff)
downloadMana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.gz
Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.bz2
Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.xz
Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.zip
Merge remote branch '1.0/1.0'
Conflicts: data/graphics/CMakeLists.txt data/graphics/Makefile.am src/client.cpp
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index bb4e21bc..d9e09656 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-1.0.0 (31 March 2010)
+1.0.0 (...)
- The Mana World client is now called the Mana client
- Added support for branding the client differently via command line parameter
- Added support for ManaServ and eAthena (TMW version) from the same binary