1
0
Fork 0
arangodb/VS2012
Frank Celler be162a1e35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	CHANGELOG
	Documentation/Manual/NewFeatures14.md
	Documentation/Manual/NewFeatures14TOC.md
	Documentation/Manual/Upgrading14.md
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2013-10-14 14:00:29 +02:00
..
Arango Client Library update VS project files 2013-09-05 18:24:01 +02:00
Arango Front End Library VC 2013-10-01 12:37:06 +02:00
Arango MRuby Library windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00
Arango Readline Library windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00
Arango Regex Library windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00
Arango V8 Library update VS project files 2013-09-05 18:24:01 +02:00
ArangoDB Library windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00
Arangod Binary VC 2013-10-01 12:37:06 +02:00
Arangoimp Binary Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-30 14:39:59 +02:00
Arangosh Binary Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-10-14 14:00:29 +02:00
Installer updated batch files 2013-10-11 13:03:47 +02:00
arango.sln updated sln 2013-10-11 12:45:06 +02:00