1
0
Fork 0
arangodb/config
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
..
bison-c++.sh more simple-query stuff 2012-02-27 10:18:18 +01:00
bison-c.sh added jsunity 2012-01-28 20:55:53 +01:00
build_errorfile.sh merge with SVN 2012-03-21 09:06:11 +01:00
build_header.sh merge with SVN 2012-03-21 09:06:11 +01:00
build_info.sh added build number 2012-01-04 11:50:51 +01:00
compile regenerated files 2012-11-13 16:11:24 +01:00
config.h.in added missing (empty) file 2012-01-10 12:29:57 +01:00
detect_distro.sh added LinuxMint and ArchLinux 2012-07-25 15:00:17 +02:00
flex-c++.sh fixed warning 2012-05-23 11:33:57 +02:00
flex-c.sh adjustment for different build dir 2012-01-04 15:23:06 +01:00
generateErrorfile.py moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
install-sh regenerated files 2012-11-13 16:11:24 +01:00
js2c.sh I wont say it 2012-10-05 19:01:18 +08:00
missing regenerated files 2012-11-13 16:11:24 +01:00
mr2c.sh preparation for mruby console 2012-06-02 11:13:57 +02:00