6 Commits

Author	SHA1	Message	Date
Frank Celler	7380ddfabe	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel ... Conflicts: arangosh/V8Client/arangosh.cpp bin/arango32.msi bin/arango64.msi lib/BasicsC/win-utils.c	2013-01-15 15:50:47 +01:00
Oreste Panaia	c01a5c6275	arango shell and import	2013-01-14 20:16:09 +08:00
Frank Celler	503e0ff8fe	fixed merge conflicts	2013-01-02 18:07:57 +01:00
Jan Steemann	9155b400c2	some fixes for readline	2012-12-18 12:25:04 +01:00
Oreste Panaia	857b66c490	windows version	2012-12-06 20:44:01 +08:00
Jan Steemann	d2d7896846	moved classes to separate files	2012-10-17 15:23:10 +02:00