Frank Celler
|
1345a1c08c
|
updated examples, VERSION, removed uneeded include
|
2013-03-03 22:59:39 +01:00 |
a-brandt
|
419fde285d
|
changed version to 1.2.devel
|
2013-02-18 10:55:25 +01:00 |
|
Frank Celler
|
ced7b05cca
|
added fix for TRI_ENABLE_LOGGING from Jan
|
2013-02-16 14:03:35 +01:00 |
|
Frank Celler
|
d461356c67
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
Conflicts:
CHANGELOG
Documentation/Makefile.files
VERSION
arangod/Documentation/api-graph.dox
arangod/Documentation/api-simple.dox
arangod/Documentation/aql.dox
arangod/Documentation/implementor-manual.dox
arangod/Documentation/index-cap.dox
arangod/Documentation/index-fulltext.dox
arangod/Documentation/index-geo.dox
arangod/Documentation/index-hash.dox
arangod/Documentation/index-skiplist.dox
build_posix.h
configure.ac
js/common/tests/shell-database.js
|
2013-02-10 16:22:55 +01:00 |
|
a-brandt
|
e1e32f0e3b
|
changed version number to 1.3.alpha
|
2013-02-06 10:22:58 +01:00 |
|
Frank Celler
|
1c2441da37
|
release version 1.2.beta1
|
2013-02-01 23:15:46 +01:00 |
Jan Steemann
|
1a339bfee4
|
fixed version number
|
2013-01-03 10:55:06 +01:00 |
|
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 |
Oreste Panaia
|
83ded3fc1f
|
windows fixes
|
2012-12-20 17:17:30 +08:00 |