You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/extern/osg-ffmpeg-videoplayer
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
10 years ago
..
CMakeLists.txt Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
License.txt Rename to osg-ffmpeg-videoplayer 10 years ago
audiodecoder.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
audiodecoder.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
audiofactory.hpp Rename to osg-ffmpeg-videoplayer 10 years ago
libavwrapper.cpp Rename to osg-ffmpeg-videoplayer 10 years ago
videodefs.hpp Rename to osg-ffmpeg-videoplayer 10 years ago
videoplayer.cpp Potentially missing includes 10 years ago
videoplayer.hpp Fix for travis build issue 10 years ago
videostate.cpp Potential include fix 10 years ago
videostate.hpp Potential include fix 10 years ago