diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-24 16:48:38 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-24 16:48:38 +0900 |
| commit | 5ef8aa765faf1981d35a47dfb27110d0ad1397e6 (patch) | |
| tree | a5714e57b10dec9c3e9e2c4f2ced40f86904e77d /doc | |
| parent | cc967ebfb6977c7ff39d5172719da5cebe2b9667 (diff) | |
| parent | dd680b6e67ab3da85e32bb7cf42b5a20822b27bc (diff) | |
| download | mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.tar.gz mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.zip | |
resolve conflict
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/compile/README.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/compile/README.md b/doc/compile/README.md index a1c915a0e..ec995bd74 100644 --- a/doc/compile/README.md +++ b/doc/compile/README.md @@ -118,7 +118,9 @@ Configuration of the Linker binary, flags and library paths. conf.linker do |linker| linker.command = ... linker.flags = ... + linker.flags_before_libraries = ... linker.libraries = ... + linker.flags_after_libraries = ... linker.library_paths = .... linker.option_library = ... linker.option_library_path = ... |