changeset 375:e024ef14f35b

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 17 Oct 2012 01:47:49 +0300
parents 097b537fa957 (current diff) b9f48cdf05c5 (diff)
children 40e33ad0d153
files dmengine.h
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Oct 17 01:47:43 2012 +0300
+++ b/.hgignore	Wed Oct 17 01:47:49 2012 +0300
@@ -6,6 +6,10 @@
 *.o
 *.a
 *.mak
+jmix_c.c
 modules/
 exe/
 fgcl/
+njv/
+examples/
+ft/
--- a/dmengine.h	Wed Oct 17 01:47:43 2012 +0300
+++ b/dmengine.h	Wed Oct 17 01:47:49 2012 +0300
@@ -1,5 +1,5 @@
-#ifndef DMSIMPLE_H
-#define DMSIMPLE_H
+#ifndef DMENGINE_H
+#define DMENGINE_H
 
 #include "dmlib.h"
 #include <SDL_events.h>
@@ -301,4 +301,4 @@
 }
 #endif
 
-#endif // DMSIMPLE_H
+#endif // DMENGINE_H