Marc Zinnschlag be7f344eca Merge branch 'refs' ...

Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp

2014-05-30 10:38:38 +02:00

..

model

Merge branch 'refs'

2014-05-30 10:38:38 +02:00

view

Merge branch 'openmw-30'

2014-05-18 22:38:52 +02:00

CMakeLists.txt

require boost::locale only on Windows

2014-05-22 15:42:47 +04:00

editor.cpp

text encoding configuration (was using hardcoded settings before)

2014-05-12 10:32:57 +02:00

editor.hpp

Merge branch 'master' into load

2014-05-03 14:36:06 +02:00

main.cpp

Merge branch 'operations' into load

2014-05-08 13:17:24 +02:00