Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/config
History
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
..
bison-c++.sh more simple-query stuff 2012-02-27 10:18:18 +01:00
bison-c.sh added jsunity 2012-01-28 20:55:53 +01:00
build_errorfile.sh merge with SVN 2012-03-21 09:06:11 +01:00
build_header.sh merge with SVN 2012-03-21 09:06:11 +01:00
build_info.sh added build number 2012-01-04 11:50:51 +01:00
compile Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
config.guess Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
config.h.in added missing (empty) file 2012-01-10 12:29:57 +01:00
config.sub Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
depcomp Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
detect_distro.sh added LinuxMint and ArchLinux 2012-07-25 15:00:17 +02:00
flex-c++.sh fixed warning 2012-05-23 11:33:57 +02:00
flex-c.sh adjustment for different build dir 2012-01-04 15:23:06 +01:00
generateErrorfile.py jslint 2012-05-24 23:25:19 +02:00
install-sh Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
js2c.sh more simple-query stuff 2012-02-27 10:18:18 +01:00
missing Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-09-20 16:39:59 +02:00
mr2c.sh preparation for mruby console 2012-06-02 11:13:57 +02:00