Merge branch '1.9.3' of tasktools.org:task into 1.9.3

Conflicts:
	src/Config.cpp
This commit is contained in:
Johannes Schlatow 2010-09-02 01:53:25 +02:00
commit 2eaba55481
27 changed files with 663 additions and 338 deletions

View file

@ -125,8 +125,6 @@ void Context::initialize ()
if (locale != "")
stringtable.load (location.data + "/strings." + locale);
// TODO Handle "--version, -v" right here?
// init TDB.
tdb.clear ();
std::vector <std::string> all;