Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg		2013-12-07 12:27:06 +01:00
..
launcher
mac	OpenCS.app icon & bundle properties	2013-11-10 20:11:53 +04:00
materials	Add parallax mapping for objects	2013-12-05 15:51:07 +01:00
mygui	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
opencs	Merge remote-tracking branch 'sirherrbatka/filters' into saving	2013-10-21 18:59:12 +02:00
ui	Fix for file path issues	2013-10-26 22:55:44 -05:00
water
CMakeLists.txt
opencs.cfg
opencs.desktop	added keywords for debian and switch to dyn libs in travis	2013-11-20 10:16:51 +01:00
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop	added keywords for debian and switch to dyn libs in travis	2013-11-20 10:16:51 +01:00
settings-default.cfg	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
transparency-overrides.cfg