Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: arangod/V8Server/v8-vocbase.cpp		2014-01-21 09:29:45 +01:00
..
FILES.md	…
LOCKS.md	…
auth.c	removed superfluous macro and check	2014-01-17 23:16:18 +01:00
auth.h	…
barrier.c	…
barrier.h	…
cleanup.c	removed superfluous macro and check	2014-01-17 23:16:18 +01:00
cleanup.h	…
collection.c	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-21 09:29:45 +01:00
collection.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-21 09:29:45 +01:00
compactor.c	removed superfluous macro and check	2014-01-17 23:16:18 +01:00
compactor.h	…
datafile.c	…
datafile.h	…
document-collection.c	fixed dropping of collections	2014-01-17 18:27:55 +01:00
document-collection.h	…
edge-collection.c	…
edge-collection.h	…
general-cursor.c	…
general-cursor.h	…
headers.c	…
headers.h	…
index.c	removed superfluous macro and check	2014-01-17 23:16:18 +01:00
index.h	…
key-generator.c	…
key-generator.h	…
marker.c	…
marker.h	…
primary-collection.c	…
primary-collection.h	…
replication-applier.c	…
replication-applier.h	…
replication-common.c	…
replication-common.h	…
replication-dump.c	…
replication-dump.h	…
replication-logger.c	…
replication-logger.h	…
replication-master.c	…
replication-master.h	…
server.c	…
server.h	…
synchroniser.c	removed superfluous macro and check	2014-01-17 23:16:18 +01:00
synchroniser.h	…
transaction.c	…
transaction.h	…
update-policy.c	…
update-policy.h	…
voc-shaper.c	…
voc-shaper.h	…
voc-types.h	…
vocbase-defaults.c	…
vocbase-defaults.h	…
vocbase.c	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-21 09:29:45 +01:00
vocbase.h	fixed dropping of collections	2014-01-17 18:27:55 +01:00