David Cernat 3136a12051 Resolve conflicts in pull request #75 ... # Conflicts: # CMakeLists.txt # apps/openmw/CMakeLists.txt		2016-10-14 18:34:17 +03:00
..
LuaBridge	Syncing inventory, animations, position, 8 key attributes	2016-07-07 23:50:48 +08:00
oics	Uses FindTinyXML to find package	2016-06-12 21:40:02 +03:00
osg-ffmpeg-videoplayer	Use OpenThreads instead of boost thread	2016-10-10 18:23:06 +02:00
osgQt	Clang warning fix	2016-08-14 15:20:52 +02:00