scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ...

Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt

2015-06-13 21:11:24 +02:00

..

bsatool.cpp

Remove strings.h wrapper

2015-05-10 00:36:04 +02:00

CMakeLists.txt

Refactor cmake scripts, reducing the amount of find_package(Boost)

2015-06-12 01:45:19 +02:00