1
0
Fork 0
Commit Graph

6 Commits

Author SHA1 Message Date
Jan Steemann 21735bb267 minor changes 2012-10-29 15:34:28 +01:00
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Jan Steemann 95006138ed put parameters on individual lines 2012-10-15 11:31:00 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00