Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: src/main.cpp
2014-01-23 12:54:28 -07:00 · 2014-01-23 12:54:28 -07:00 · 3f78af9a3d
commit 3f78af9a3d
parent 31a4900765 eb1a1c0275
1 changed files with 3 additions and 0 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -31,10 +31,13 @@ char* readline(const char* p)
  return std::cin.eof() ? NULL : mystrdup(retval.c_str());
 }

+
 void add_history(const char*){}
 void using_history(){}
 #endif

+
+
 void *cast_module_symbol(std::string (*t_path)())
 {
  union cast_union