Merge branch 'master' of git://ahi.cs.unc.edu/pavel/FasTC

This commit is contained in:
Pavel Krajcevski 2014-10-31 17:39:07 -04:00
commit 0c25135555
3 changed files with 4 additions and 1 deletions

View file

@ -53,6 +53,7 @@
#define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN
#include <algorithm>
#include <cassert>
#include <cstdlib>
#include <cstdio>

View file

@ -62,6 +62,8 @@ IF(MSVC)
SET(MSVC_VERSION_STRING vc100)
ELSEIF(MSVC11)
SET(MSVC_VERSION_STRING vc110)
ELSEIF(MSVC12)
SET(MSVC_VERSION_STRING vc120)
ELSEIF(MSVC90)
SET(MSVC_VERSION_STRING vc90)
ELSEIF(MSVC80)

@ -1 +1 @@
Subproject commit 4feeeb6550851ba3541c3f9505c76018e665667e
Subproject commit 6d9f6ba0f9ebec0f6735b1f29527ea5835ef3572