Marc Zinnschlag d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' ...

Conflicts:
	apps/openmw/mwrender/localmap.cpp

2014-05-15 08:13:15 +02:00

..

model

Revert "Fixes for warnings when building with MSVC"

2014-05-14 00:03:30 -05:00

view

Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'

2014-05-15 08:13:15 +02:00

CMakeLists.txt

Merge branch 'operations' into load

2014-05-08 13:17:24 +02: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