Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # 3rdParty/V8/v8 # arangod/Transaction/Methods.h # arangod/Utils/UserTransaction.h # arangod/V8Server/v8-collection.cpp		2017-03-01 14:52:35 +01:00
..
V8	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00
boost	…
curl/curl-7.50.3	…
libcuckoo	…
linenoise-ng	…
rocksdb/rocksdb	…
snappy/google-snappy-d53de18	…
valgrind	…
velocypack	…
zlib/zlib-1.2.8	…
.gitignore	…
CMakeLists.txt	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00