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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jason Turner
2015-03-21 14:14:33 -06:00
parent c584c29951 e6d71373b8
commit 735088dc96
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -26,6 +26,14 @@ notifications:
- jason@emptycrate.com - jason@emptycrate.com
on_success: always on_success: always
on_failure: always on_failure: always
webhooks:
urls:
- https://webhooks.gitter.im/e/4be9a2720eaa1bb2a6c9
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false
env: env:
global: global:
secure: eiaR6pXiiEpyB8+LLQ1NvZdl0Yylru1BLy9lMoHl+IpUNGGQGywmW/2WAn77rFfmR1OPA2qWQLfgPwgK0HxUA9HHlot9tre5QhiN2Lw8NOT8tCZ6tTm2+QntDBjBGJyal/knRvQkn/6qs6GxlXRerz4ArnnuPL1vESt3zwB0YtU= secure: eiaR6pXiiEpyB8+LLQ1NvZdl0Yylru1BLy9lMoHl+IpUNGGQGywmW/2WAn77rFfmR1OPA2qWQLfgPwgK0HxUA9HHlot9tre5QhiN2Lw8NOT8tCZ6tTm2+QntDBjBGJyal/knRvQkn/6qs6GxlXRerz4ArnnuPL1vESt3zwB0YtU=

2
include/chaiscript/chaiscript.hpp
View File

@@ -170,7 +170,7 @@
/// ///
/// ~~~~~~~~~{.cpp} /// ~~~~~~~~~{.cpp}
/// chai.add_global_const(const_var(i), "i"); /// chai.add_global_const(const_var(i), "i");
/// chai("def somefun() { print(i); }; sumfun();"); /// chai("def somefun() { print(i); }; somefun();");
/// ~~~~~~~~~ /// ~~~~~~~~~
/// ///
/// @subsubsection adding_functions Adding Functions /// @subsubsection adding_functions Adding Functions