Merge remote-tracking branch 'origin/master'

Conflicts: Driver/pmachine.c
windschaser · Jul 11, 2015 · 30bcc32 · 30bcc32
2 parents f7150c3 + 48ae890
commit 30bcc32
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.o
+parser.exe