Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod
History
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 		2012-12-20 11:11:47 +01:00
..
Actions windows fixes 2012-12-20 17:17:30 +08:00
Ahuacatl Merge remote-tracking branch 'origin/windows' into HEAD 2012-12-20 11:11:47 +01:00
BitIndexes windows fixes 2012-12-20 17:17:30 +08:00
Documentation windows fixes 2012-12-20 17:17:30 +08:00
GeoIndex fixed some memory zone issues 2012-10-10 15:17:46 +02:00
HashIndex windows fixes 2012-12-20 17:17:30 +08:00
IndexIterators Bitarray indexes update 2012-07-05 13:59:26 +08:00
IndexOperators draft index interface 2012-09-03 17:05:39 +08:00
MRServer windows fixes 2012-12-20 17:17:30 +08:00
PriorityQueue windows version 2012-12-06 20:44:01 +08:00
RestHandler windows fixes 2012-12-20 17:17:30 +08:00
RestServer Merge remote-tracking branch 'origin/windows' into HEAD 2012-12-20 11:11:47 +01:00
SkipLists windows fixes 2012-12-20 17:17:30 +08:00
Utils renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
V8Server Merge remote-tracking branch 'origin/windows' into HEAD 2012-12-20 11:11:47 +01:00
VocBase Merge remote-tracking branch 'origin/windows' into HEAD 2012-12-20 11:11:47 +01:00
Makefile.files no longer used 2012-10-11 19:58:31 +02:00