resolved conflict

diff --git a/README b/README
index 0ab2e72..49f8fc8 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Variations on Rockdodger 0.5.2
+Variations on Rockdodger 0.5.3
 
 VoR is a quick action game where you drive a space ship and try to avoid
 crashing into rocks. Current information about vor can be found on the
@@ -25,6 +25,10 @@ Changes from Rock Dodgers
 
 User-Visible Changes:
 
+0.5.3:
+  * another attempt at fixing the x86 crashes.
+  * made valgrind happy.
+
 0.5.2:
   * another attempt at fixing the x86 crashes.
 

diff --git a/config.h b/config.h
index a17c5df..91b8c3b 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 #ifndef VOR_CONFIG_H
 #define VOR_CONFIG_H
 
-#define VERSION "0.5.2"
+#define VERSION "0.5.3"
 
 // screen size
 #define XSIZE 640

diff --git a/main.c b/main.c
index 4d341c0..548cf42 100644 (file)
--- a/main.c
+++ b/main.c
@@ -791,7 +791,7 @@ main(int argc, char **argv) {
        frames = 0;
        gameloop();
        end = SDL_GetTicks();
-       //printf("%ld frames in %ld ms, %.2f fps.\n", frames, end-start, frames * 1000.0 / (end-start));
+       // printf("%ld frames in %ld ms, %.2f fps.\n", frames, end-start, frames * 1000.0 / (end-start));
 
        return 0;
 }