56 Commits

Author	SHA1	Message	Date
Oreste Panaia	56cd3327a6	merge problems	2012-10-22 21:51:23 +08:00
Frank Celler	27cf9d9b04	Merge branch 'devel' of github.com:triAGENS/ArangoDB ... Conflicts: 3rdParty/Makefile.all-in-one-zeromq Makefile.in js/actions/system/api-blueprint.js js/actions/system/api-system.js	2012-10-11 14:33:31 +02:00
Jan Steemann	029c840b09	fixed a memleak	2012-10-09 14:49:45 +02:00
Jan Steemann	8eb4ee0311	added arangob options	2012-09-28 17:06:20 +02:00
Jan Steemann	aad951e2ab	added collection dropping & creation	2012-09-28 15:11:14 +02:00
Jan Steemann	a54e6e4a95	added man file for arangob	2012-09-28 11:58:06 +02:00