Marc Zinnschlag c6ff58d5b5 Merge remote-tracking branch 'scrawl/videoplayback' ...

Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt

2013-01-08 11:17:19 +01:00

..

mwbase

Merge branch 'master' into videoplayback

2013-01-07 13:25:15 +01:00

mwclass

Cell names localization fix

2012-12-23 23:23:24 +04:00

mwdialogue

Merge branch 'master' of git://github.com/zinnschlag/openmw

2013-01-01 22:18:21 +04:00

mwgui

Merge branch 'master' into videoplayback

2013-01-07 13:25:15 +01:00

mwinput

Merge branch 'master' into videoplayback

2013-01-07 13:25:15 +01:00

mwmechanics

Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD

2013-01-03 02:34:31 +01:00

mwrender

Merge remote-tracking branch 'scrawl/videoplayback'

2013-01-08 11:17:19 +01:00

mwscript

Merge remote-tracking branch 'scrawl/videoplayback'

2013-01-08 11:17:19 +01:00

mwsound

Add missing decoder method declarations

2012-12-28 11:26:41 -08:00

mwworld

Merge branch 'master' into videoplayback

2013-01-07 13:25:15 +01:00

CMakeLists.txt

Merge branch 'master' into videoplayback

2013-01-07 13:25:15 +01:00

config.hpp.cmake

another minor correction (fixing the previous one)

2011-07-08 16:16:06 +02:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00

engine.cpp

to_utf8, Utf8Encoder: pass encoding as constructor parameter

2013-01-06 01:37:58 +01:00

engine.hpp

renamed namespace TranslationData to Translation

2012-12-26 17:06:33 +01:00

main.cpp

made previous commits naming standard compliant

2012-12-26 16:19:59 +01:00