5 Commits

Author	SHA1	Message	Date
Frank Celler	db868d1147	Merge branch 'oreste' of github.com:triAGENS/AvocadoDB ... Conflicts: BasicsC/vector.c	2012-05-08 09:31:26 +02:00
Frank Celler	de0b90b664	merged with oreste	2012-05-08 09:28:18 +02:00
Frank Celler	e878af3cf1	fixed eol	2012-05-03 13:17:18 +02:00
Frank Celler	5aae1ea615	merged Oreste's newest changes	2012-05-03 09:22:22 +02:00
Frank Celler	88843a4972	merged with oreste	2012-04-27 14:39:42 +02:00