Merge remote branch 'pvdk/master'

Browse Source

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwsound/soundmanager.cpp

...

This commit is contained in:

Marc Zinnschlag 2011-01-06 09:45:14 +01:00

parent ba18dc46ef dd4d022301

commit 4dd8616f87

51 changed files with 1803 additions and 1803 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files