6 Commits

Author	SHA1	Message	Date
Frank Celler	b0e452f74a	Merge branch 'master' of github.com:triAGENS/ArangoDB into devel ... Conflicts: CHANGELOG Makefile.am Makefile.in arangod/V8Server/v8-vocbase.cpp	2012-08-02 17:17:36 +02:00
Jan Steemann	cc81db31a8	doxygen fixes	2012-07-26 09:46:22 +02:00
Frank Celler	97ff940736	fixed merge	2012-07-24 23:07:31 +02:00
Frank Celler	dc05fc3562	Amazon Micro Instance	2012-07-17 17:16:01 +02:00
Frank Celler	0e7d6f8f2a	added prepare and open	2012-06-19 23:20:33 +02:00
Frank Celler	d2c758d663	the great rename	2012-06-08 15:01:25 +02:00