Oreste Panaia 95f6b0dc9c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel		2013-01-31 16:22:41 +08:00
..
Admin	updated documentation (#227, #228, #229)	2012-10-11 00:36:47 +02:00
ApplicationServer	fixed doxygen error, added comment	2013-01-02 13:40:47 +01:00
Basics	windows icu	2013-01-31 00:04:20 +08:00
BasicsC	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-01-31 16:22:41 +08:00
Dispatcher	fixed doc issue, doxygen sometimes does not recognize the used namespace	2012-10-16 17:34:54 +02:00
Documentation	fixed shutdown	2012-07-01 14:10:01 +02:00
GeneralServer	fixed merge conflicts	2013-01-02 18:07:57 +01:00
HttpServer	do not authenticate HTTP OPTIONS requests	2013-01-29 15:43:39 +01:00
JsonParser	fixed building of html/admin/js files	2013-01-18 10:27:25 +01:00
Logger	windows fixes	2012-12-20 17:17:30 +08:00
MRuby	merged with 1.0	2012-09-21 10:10:34 +02:00
ProgramOptions	windows fixes	2012-12-20 17:17:30 +08:00
Rest	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-01-31 00:07:19 +08:00
ResultGenerator	various changes for windows	2012-10-22 20:51:31 +08:00
Scheduler	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2013-01-15 15:50:47 +01:00
ShapedJson	added number of shapes in return value of figures()	2013-01-25 10:19:02 +01:00
SimpleHttpClient	fixed error messages in simplehttpclient	2013-01-15 18:33:07 +01:00
Statistics	wrapper for memory mapped files add	2012-10-05 18:31:13 +08:00
Utilities	fix a few -pedantic errors	2013-01-23 08:58:54 +01:00
V8	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-01-31 00:07:19 +08:00
Variant	minor changes for windows compatability	2012-09-28 17:34:22 +08:00
Makefile.bison	removed generated files	2012-10-11 20:37:41 +02:00
Makefile.files	windows icu	2013-01-31 00:04:20 +08:00
Makefile.flex	removed generated files	2012-10-11 20:37:41 +02:00
valgrind.supp	ignore protobuf	2012-07-01 14:43:36 +02:00