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 |
Jan Steemann
Oreste Panaia