scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout

2015-02-27 22:21:02 +01:00

..

ogre-ffmpeg-videoplayer

Use av_get_default_channel_layout for unknown channel layouts

2014-11-01 19:37:54 +01:00

oics

Merge remote-tracking branch 'upstream/master'

2015-02-27 22:21:02 +01:00

sdl4ogre

Merge remote-tracking branch 'upstream/master'

2015-02-27 22:21:02 +01:00

shiny

Clean up listener in destruction of OgrePlatform (Fixes #2145)

2014-11-28 23:15:07 +01:00