Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Fraser Hutchison
2013-11-07 19:28:32 +00:00
2 changed files with 17 additions and 0 deletions

View File

@@ -14,6 +14,7 @@
#include <sstream>
#include <iomanip>
#include <limits>
#include <vector>
#ifdef __OBJC__
#include "catch_objc_arc.hpp"