Merge remote branch 'pvdk/master'

Browse Source

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

actorid

Marc Zinnschlag 14 years ago

parent ba18dc46ef dd4d022301

commit 4dd8616f87

51 changed files with 1865 additions and 1865 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

Write Preview

Loading…

Cancel

Save