graffy76 f87eb67968 Fixed conflicts ... Merge branch 'cs-windows' of https://github.com/Glorf/openmw Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/model/settings/usersettings.hpp apps/opencs/view/settings/usersettingsdialog.cpp		2013-06-17 06:45:44 -05:00
..
bsatool	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
esmtool	Plain output moved at the end of records output.	2013-05-22 20:24:23 +02:00
launcher	trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.	2013-06-11 23:00:12 -05:00
mwiniimporter	add dpkg information for mwiniimporter, this blocked debian/ubuntu buildd from building	2013-03-23 16:20:10 +01:00
opencs	Fixed conflicts	2013-06-17 06:45:44 -05:00
openmw	Merge branch 'openmw24'	2013-06-12 10:37:33 +02:00
openmw_test_suite	Added fix for not visible pthreads functions for linker with glibc 2.15	2012-08-20 00:18:40 +03:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00