1
0
Fork 0
arangodb/m4
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
2012-09-20 16:39:59 +02:00
..
acx_pthread.m4 initial release 2011-10-26 21:32:36 +02:00
all-in-one.boost cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
all-in-one.icu changed ICU_LIBS 2012-09-20 09:23:26 +02:00
all-in-one.libev cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
all-in-one.mruby Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
all-in-one.protobuf cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
all-in-one.v8 cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
all-in-one.zeromq added ZeroMQQueueThread 2012-06-19 12:28:55 +02:00
ax_boost_base.m4 initial release 2011-10-26 21:32:36 +02:00
ax_cxx_check_lib.m4 initial release 2011-10-26 21:32:36 +02:00
ax_prog_gperf.m4 initial release 2011-10-26 21:32:36 +02:00
configure.basics cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
configure.bison cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
configure.coverage added missing file 2012-04-13 09:38:07 +02:00
configure.documentation added README generator 2012-08-31 15:40:45 +02:00
configure.flex cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
configure.information Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
configure.largefile initial release 2011-10-26 21:32:36 +02:00
configure.logging added log option 2012-07-04 23:02:45 +02:00
configure.memory memory checks 2012-04-26 14:31:13 +02:00
configure.static added rest interface 2011-11-20 22:38:30 +01:00
configure.threads added configure option --enable-lock-check 2012-09-10 18:17:57 +02:00
external.boost cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
external.icu Chnaged ICU_LDFLAGS and ICU_LIBS 2012-09-20 10:02:06 +02:00
external.libev cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
external.math cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
external.openssl cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
external.protobuf cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00
external.readline deleted NCURSES 2012-09-10 15:09:32 +02:00
external.v8 cleanup directory structure and init file handling 2012-08-30 16:54:42 +02:00