Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop

Conflicts:
	CMakeLists.txt
This commit is contained in:
Jason Turner
2015-03-21 21:04:03 -06:00
2 changed files with 6 additions and 1 deletions

View File

@@ -45,7 +45,7 @@
namespace chaiscript {
static const int version_major = 5;
static const int version_minor = 6;
static const int version_minor = 7;
static const int version_patch = 0;
}