1
0
Fork 0
arangodb/config
Frank Celler a4264bfa1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3
Conflicts:
	VERSION
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/explain.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/query.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/transaction.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/user.json
	js/apps/system/aardvark/api-docs/version.json
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/testing.js
2014-10-29 12:22:48 +01:00
..
build_completions.sh added completion generator 2014-10-22 23:09:37 +02:00
build_errorfile.sh
build_header.sh
build_info.sh
build_mimetypes.sh added mimetype generation file 2013-03-27 10:11:56 +01:00
compile release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
config.guess release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
config.h.in Print beautiful stacktraces for C-Asserts. 2014-08-13 17:09:27 +02:00
config.sub release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
depcomp release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
detect_distro.sh added LinuxMint and ArchLinux 2012-07-25 15:00:17 +02:00
generateErrorfile.py Merge branch 'aql2' of github.com:triAGENS/ArangoDB into 2.3 2014-10-02 17:40:01 +02:00
generateMimetypes.py finalized move to cxx 2014-09-14 00:06:00 +02:00
install-sh release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
missing release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
mr2c.sh preparation for mruby console 2012-06-02 11:13:57 +02:00