Merge branch 'master' of https://github.com/spidamoo/sod.git

Conflicts: .gitignore
spidamoo · Sep 28, 2013 · da5d8be · da5d8be
2 parents 9d6adb8 + b652013
commit da5d8be
Show file tree

Hide file tree

Showing 138 changed files with 1,016 additions and 1,323 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-*.exe
 *.o
-*.layout
-*.log
+*.exe
+*.log
+*.layout