1
0
Fork 0
arangodb/lib/Rest
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
..
AnyServer.cpp Merge remote-tracking branch 'origin/windows' into HEAD 2012-12-20 11:11:47 +01:00
AnyServer.h windows fixes 2012-12-20 17:17:30 +08:00
AsyncJobServer.h
ConnectionInfo.h
Endpoint.cpp moved classes to separate files 2012-10-17 15:23:10 +02:00
Endpoint.h windows version 2012-12-06 20:44:01 +08:00
EndpointIp.cpp windows version 2012-12-06 20:44:01 +08:00
EndpointIp.h windows version 2012-12-06 20:44:01 +08:00
EndpointIpV4.cpp moved classes to separate files 2012-10-17 15:23:10 +02:00
EndpointIpV4.h moved classes to separate files 2012-10-17 15:23:10 +02:00
EndpointIpV6.cpp moved classes to separate files 2012-10-17 15:23:10 +02:00
EndpointIpV6.h Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2012-10-20 22:37:25 +02:00
EndpointList.cpp
EndpointList.h
EndpointUnixDomain.cpp moved classes to separate files 2012-10-17 15:23:10 +02:00
EndpointUnixDomain.h moved classes to separate files 2012-10-17 15:23:10 +02:00
Handler.cpp
Handler.h
HttpRequest.cpp Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-22 21:04:12 +08:00
HttpRequest.h Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-22 21:04:12 +08:00
HttpResponse.cpp issue #231: handle some obviously invalid requests 2012-10-15 19:10:00 +02:00
HttpResponse.h issue #231: handle some obviously invalid requests 2012-10-15 19:10:00 +02:00
InitialiseRest.cpp windows version 2012-12-06 20:44:01 +08:00
InitialiseRest.h various changes for windows 2012-10-22 20:51:31 +08:00
JsonContainer.cpp
JsonContainer.h
LineRequest.h
LineResponse.h
MaintenanceCallback.h
OperationMode.h
SslInterface.cpp Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-22 21:04:12 +08:00
SslInterface.h various changes for windows 2012-10-22 20:51:31 +08:00
Url.cpp
Url.h
oreste_templates.tgz moved classes to separate files 2012-10-17 15:23:10 +02:00