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

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp

2015-06-22 20:09:02 +02:00

..

doc

Merge branch 'master' into feature-color-picking

2015-06-16 22:39:12 +03:00

filter

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

render

Add missing include

2015-06-18 14:56:43 +02:00

settings

Add support to build with Qt5 (Task #2665)

2015-06-12 15:13:42 +02:00

tools

made double click behaviour in report tables configurable (Fixes #2622)

2015-06-18 16:36:27 +02:00

widget

Show the pop-up of ColorEditor immediately after the editor creation in tables

2015-06-18 12:50:46 +03:00

world

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

2015-06-22 20:09:02 +02:00