generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ChaiScript_5_0_CPP_11

Browse Source 
Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp
	include/chaiscript/dispatchkit/boxed_number.hpp
This commit is contained in:
Jason Turner
2013-11-27 09:18:08 -07:00
parent 26722d648d 41f6ca18ea
commit 5cb78ecd68
7 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@@ -12,7 +12,6 @@
#include <sstream>
#include <cstdint>
namespace chaiscript
{