Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
44,974 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

64 Commits

Author SHA1 Message Date
Frank Celler 61c6433c1c fixed building of html/admin/js files 2013-01-18 10:27:25 +01:00
Frank Celler 62942eb028 adding generating files 2012-10-22 11:54:42 +02:00
Jan Steemann a736f9994d add derived files 2012-10-15 10:23:10 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB 
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
 2012-10-11 15:19:44 +02:00
Jan Steemann 13e0ab010b derived file committed 2012-10-08 15:49:55 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann fe8ba2357c removed debug flag 2012-09-28 08:58:30 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Frank Celler 4181fd5cc4 regenerated files 2012-09-21 17:44:25 +02:00
Jan Steemann b682fa0fdb compiled with Bison 2.5 2012-09-19 09:29:55 +02:00
Frank Celler 2c9d3ded48 regenerated files 2012-06-24 20:44:51 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00