diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-17 00:28:49 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-17 00:28:49 +0900 |
| commit | 8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b (patch) | |
| tree | f55227fc4ac88eb640688e31451028a2910de618 /include/mruby.h | |
| parent | 3f85079cc045012285ce432b446b77eab82de7fe (diff) | |
| parent | 4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff) | |
| download | mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip | |
resolve conflict from #1017
Diffstat (limited to 'include/mruby.h')
| -rw-r--r-- | include/mruby.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h index 2d2bc64cc..6411f4bdb 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -32,7 +32,6 @@ extern "C" { #endif -#include <stdlib.h> #include "mrbconf.h" #include "mruby/value.h" |