Merge branch 'master' of https://github.com/sippeangelo/Escape-the-Dawn

Browse Source

Conflicts:
	Escape-the-Dawn/Systems/PlayerSystem.cpp

...

This commit is contained in:

Tleety

2015-06-02 00:42:03 +02:00

parent 3887e7abcf a7a17b3ebf

commit 582cdd2102

3 changed files with 25 additions and 5 deletions

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

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

Escape-the-Dawn/Sounds/engine.wav

BIN

Binary file not shown.