Merge branch 'dev' into short

This commit is contained in:
Heng Li
2017-09-09 08:49:58 -04:00
2 changed files with 9 additions and 88 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
#include "mmpriv.h"
#include "getopt.h"
#define MM_VERSION "2.1.1-r341"
#define MM_VERSION "2.1.1-r344-dirty"
#ifdef __linux__
#include <sys/resource.h>