8 Commits

Author	SHA1	Message	Date
Michael Hackstein	82edb8707a	Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types	2016-08-30 10:12:36 +02:00
jsteemann	bd590fb62d	Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types	2016-08-30 08:18:34 +02:00
Kaveh Vahedipour	c53428ce89	minor fixes	2016-08-29 17:13:33 +02:00
jsteemann	f92815b09b	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream	2016-08-24 09:38:06 +02:00
Kaveh Vahedipour	be51564141	updated agency pool	2016-08-23 15:57:13 +02:00
Kaveh Vahedipour	7c706ecdc8	weekend edition	2016-08-19 17:59:58 +02:00
Mark	3bd5c27c0c	changes for Visual Studio	2016-08-19 17:22:57 +02:00
Kaveh Vahedipour	d54c090a01	missing source file added	2016-08-19 08:41:19 +02:00