Merge branch 'master' into release

This commit is contained in:
PabstMirror 2015-07-27 01:49:18 -05:00
commit 81f9c92c44
8 changed files with 3 additions and 3 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -33,7 +33,7 @@ order: 9
```
cd extensions\build
cmake .. -G "Visual Studio 2014"
cmake .. -G "Visual Studio 14 2015"
```
A Visual studio project file will now be generated in your build directory.

View File

@ -89,8 +89,8 @@ endif()
string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ")
set(ACE_VERSION_MAJOR 3)
set(ACE_VERSION_MINOR 0)
set(ACE_VERSION_REVISION 1)
set(ACE_VERSION_MINOR 2)
set(ACE_VERSION_REVISION 0)
EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD
OUTPUT_VARIABLE T_ACE_VERSION_BUILD
OUTPUT_STRIP_TRAILING_WHITESPACE