Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/js
History
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
..
actions/system Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
client Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
common Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
server Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-10-11 15:19:44 +02:00
Makefile.javascript changes to allow SUBDIR build 2012-08-30 18:06:23 +02:00