Merge branch 'master' into sr

2017-09-19 22:31:14 -04:00 · 2017-09-19 22:31:14 -04:00 · 5caadc28b4
parent 56014ba3db b99c22840f
commit 5caadc28b4
1 changed files with 1 additions and 1 deletions
--- a/main.c
+++ b/main.c
@ -6,7 +6,7 @@
 #include "mmpriv.h"
 #include "getopt.h"

-#define MM_VERSION "2.2-r411-dirty"
+#define MM_VERSION "2.2-r414-dirty"

 #ifdef __linux__
 #include <sys/resource.h>