Frank Celler
|
249492a89c
|
Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
CHANGELOG
Documentation/Manual/GlossaryCollectionName.md
Documentation/Manual/NewFeatures11.md
Documentation/UserManual/FirstStepsArangoDB.md
VERSION
arangod/Documentation/api-blueprints.dox
arangod/HashIndex/hasharray.c
arangod/RestHandler/RestVocbaseBaseHandler.cpp
arangod/RestServer/ArangoServer.cpp
arangod/V8Server/v8-actions.cpp
arangod/V8Server/v8-vocbase.cpp
arangod/VocBase/compactor.c
arangod/VocBase/document-collection.c
configure.ac
html/admin/js/master.js
js/server/ahuacatl.js
js/server/arango-upgrade.js
lib/BasicsC/voc-errors.h
lib/V8/V8LineEditor.cpp
lib/V8/v8-utils.cpp
|
2012-11-27 12:34:58 +01:00 |
Frank Celler
|
40e6f12811
|
added more info about arango-upgrade
|
2012-11-26 15:25:36 +01:00 |
Frank Celler
|
56c3a4fd18
|
added web interface description
|
2012-11-25 20:19:31 +01:00 |
Frank Celler
|
f9ea4d5755
|
started adding links
|
2012-11-23 12:36:19 +01:00 |
Frank Celler
|
bd64d7e6a1
|
started adding links
|
2012-11-23 12:35:07 +01:00 |
Frank Celler
|
c3bc85826a
|
renamed Manual to UserManual, fixed references, removed First section
|
2012-11-23 11:31:54 +01:00 |
Frank Celler
|
c68dc92809
|
renamed Manual to UserManual, fixed references, removed First section
|
2012-11-23 11:28:43 +01:00 |