Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: js/common/bootstrap/module-fs.js		2013-03-23 14:36:45 +01:00
..
Admin	updated disclaimer	2013-03-13 17:03:18 +01:00
ApplicationServer	added .arangosh.rc, added /_admin/execute	2013-03-23 14:04:08 +01:00
Basics	added .arangosh.rc, added /_admin/execute	2013-03-23 14:04:08 +01:00
BasicsC	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-03-23 14:36:45 +01:00
Dispatcher	updated disclaimer	2013-03-13 17:03:18 +01:00
Documentation	…
GeneralServer	updated disclaimer	2013-03-13 17:03:18 +01:00
HttpServer	updated disclaimer	2013-03-13 17:03:18 +01:00
JsonParser	fixed handling of empty and reserved attribute names in documents	2013-03-20 11:48:33 +01:00
Logger	updated disclaimer	2013-03-13 17:03:18 +01:00
MRuby	updated disclaimer	2013-03-13 17:03:18 +01:00
ProgramOptions	updated disclaimer	2013-03-13 17:03:18 +01:00
Rest	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2013-03-13 17:05:59 +01:00
Scheduler	updated disclaimer	2013-03-13 17:03:18 +01:00
ShapedJson	fixed handling of empty and reserved attribute names in documents	2013-03-20 11:48:33 +01:00
SimpleHttpClient	updated disclaimer	2013-03-13 17:03:18 +01:00
Statistics	updated disclaimer	2013-03-13 17:03:18 +01:00
Utilities	updated disclaimer	2013-03-13 17:03:18 +01:00
V8	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-03-23 14:36:45 +01:00
Makefile.bison	removed generated files	2012-10-11 20:37:41 +02:00
Makefile.files	addendum for issue #443	2013-03-08 22:30:35 +01:00
Makefile.flex	removed generated files	2012-10-11 20:37:41 +02:00
valgrind.supp	…