Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving ...

Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp

2013-10-21 16:45:43 +02:00

..

settings

Issue #913: Merge --master and --plugin switches

2013-09-29 09:14:40 +02:00

utils

Renamed esxSelector to contentSelector

2013-09-21 23:06:29 -05:00

CMakeLists.txt

Better fix for unshield, comments on changes, no more commented out code.

2013-09-05 10:39:17 +02:00

datafilespage.cpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:14:40 +02:00

datafilespage.hpp

Renamed esxSelector to contentSelector

2013-09-21 23:06:29 -05:00

graphicspage.cpp

Renamed esxSelector to contentSelector

2013-09-21 23:06:29 -05:00

graphicspage.hpp

use index instead of string manipulation

2013-06-23 21:56:27 +02:00

main.cpp

Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154

2013-09-01 23:17:41 +04:00

maindialog.cpp

only use unshield on not windows

2013-08-19 20:20:08 +01:00

maindialog.hpp

Workaround for launcher compilation problems due to bug in Qt MOC compiler.

2013-04-02 21:32:23 +02:00

playpage.cpp

Narrowed down includes to improve compile time

2013-03-12 01:29:13 +01:00

playpage.hpp

Made the Play page use a .ui file too

2013-03-03 01:49:41 +01:00

textslotmsgbox.cpp

filenames

2013-08-19 20:19:35 +01:00

textslotmsgbox.hpp

filenames

2013-08-19 20:19:35 +01:00

unshieldthread.cpp

cleaned up bloodmoon_fix_ini

2013-09-29 16:59:52 +01:00

unshieldthread.hpp

Better fix for unshield, comments on changes, no more commented out code.

2013-09-05 10:39:17 +02:00