Pieter van der Kloet 2429f3960f Merge remote-tracking branch 'upstream/master' into launcher ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp		2012-03-05 23:43:59 +01:00
..
esmtool	Replace gengetopt with bullet program options for esmtool's argument handling	2012-03-02 04:41:29 +02:00
launcher	Merge remote-tracking branch 'upstream/master' into launcher	2012-03-05 23:43:59 +01:00
openmw	Merge remote branch 'scrawl/weather'	2012-03-05 22:45:52 +01:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00