diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/mroonga/vendor/groonga/vendor/mruby/sources.am | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-2e4984c185ddcd2da789017cd147338846ff409a.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/mroonga/vendor/groonga/vendor/mruby/sources.am')
| -rw-r--r-- | storage/mroonga/vendor/groonga/vendor/mruby/sources.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/mroonga/vendor/groonga/vendor/mruby/sources.am b/storage/mroonga/vendor/groonga/vendor/mruby/sources.am index b470d58b803..68f15c64571 100644 --- a/storage/mroonga/vendor/groonga/vendor/mruby/sources.am +++ b/storage/mroonga/vendor/groonga/vendor/mruby/sources.am @@ -11,6 +11,7 @@ libmruby_la_SOURCES = \ ../mruby-source/src/error.c \ ../mruby-source/src/error.h \ ../mruby-source/src/etc.c \ + ../mruby-source/src/fmt_fp.c \ ../mruby-source/src/gc.c \ ../mruby-source/src/hash.c \ ../mruby-source/src/init.c \ |