Merge master changes into rc.

diff --git a/Makefile b/Makefile
index 16ab0c7f026f3e94bd2c4d1ef1600bcc9ab4e837..1623247273d2ec13e65fc74ecfca49b7e578ff2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.5
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)