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 |
Jan Steemann
|
7e3a7825e5
|
updated Visual Studio projects
|
2013-10-10 17:54:49 +02:00 |
|
Frank Celler
|
ad2d4b9d76
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
VS2012/Arangod Binary/Arangod Binary.vcxproj
VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj
VS2012/Arangosh Binary/Arangosh Binary.vcxproj
arangod/Ahuacatl/ahuacatl-grammar.c
js/actions/api-database.js
js/apps/aardvark/api-docs/edges.json
js/apps/aardvark/api-docs/traversal.json
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/graph.json
js/apps/system/aardvark/api-docs/index.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
|
2013-09-30 14:39:59 +02:00 |
|
Jan Steemann
|
a6af206ae3
|
update VS project files
|
2013-09-05 18:24:01 +02:00 |
|
Jan Steemann
|
a7ef5fa4dd
|
fix output directories
|
2013-09-05 16:32:00 +02:00 |
|
Jan Steemann
|
6f17633b84
|
updated VS project files for Windows
|
2013-09-05 15:45:50 +02:00 |
Oreste Panaia
|
84989a8c6f
|
windows vs 2012 prepartion
|
2013-07-25 15:49:57 +08:00 |