diff options
| author | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:51:56 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:51:56 -0400 |
| commit | 22fd8623af3f57c4e28f43f793bae4d14948abc0 (patch) | |
| tree | c4936680f4cffd0d52e4d96aed39404fdaa30a52 /.gitignore | |
| parent | dfb65f04b8579c9c4e24086452474adcae9b87b7 (diff) | |
| parent | a3db993224c994fdff6f50fedcc266c5e0b94aa8 (diff) | |
Merge remote-tracking branch 'origin/master'
d
Conflicts:
include/World.h
include/common.h
include/entities.h
src/UIClass.cpp
src/World.cpp
src/entities.cpp
src/main.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,3 +1,3 @@ -main.exe -main -game.odt +main.exe
+main
+game.odt
|