Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/VS2012/Arangosh Binary
History
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
..
Arangosh Binary.vcxproj Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-10-14 14:00:29 +02:00
Arangosh Binary.vcxproj.filters updated Visual Studio projects 2013-10-10 17:54:49 +02:00
Arangosh Binary.vcxproj.user windows vs 2012 prepartion 2013-07-25 15:49:57 +08:00