summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-10 21:57:09 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-10 21:57:09 +0100
commit9f2a8799eea3d609a3863a7732ec280d83f12e47 (patch)
tree719f9e8703211937fc2452055c7a8d5be05bd2f8 /docs
parent53840c3fe951c77fa7965efcac4ed77b52da14d9 (diff)
parenta8a992ade40c9d68c9faec1cc3a54e7f064fb9d5 (diff)
downloadMana-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.gz
Mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.bz2
Mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.xz
Mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.zip
Merge branch 'aethyra/master'
Conflicts: docs/FAQ.txt packaging/windows/make-translations.vbs src/Makefile.am src/gui/colour.cpp src/gui/colour.h src/gui/popupmenu.cpp src/gui/setup_colours.h src/main.cpp src/main.h src/resources/resourcemanager.cpp src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h
Diffstat (limited to 'docs')
-rw-r--r--docs/FAQ.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index 7c2000fd..b214672e 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -75,9 +75,7 @@ A: There are a lot of ways:
http://sourceforge.net/projects/themanaworld/
- You can be a beta tester. Just play The Mana World and report every
- error to the tracker. Read for more infos on the project page:
-
- http://themanaworld.org/
+ error to the tracker or on the forum.
- Play with The Mana World: more players, more fun! Simple as that! ;-)