Merge branch 'master' into short

This commit is contained in:
Heng Li
2017-09-07 11:41:32 -04:00
9 changed files with 188 additions and 7 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
#include "mmpriv.h"
#include "getopt.h"
#define MM_VERSION "2.1-r335-dirty"
#define MM_VERSION "2.1.1-r341"
#ifdef __linux__
#include <sys/resource.h>