Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.4' into devel 

Conflicts:
	CHANGELOG
	Makefile.in
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/frontend/js/routers/router.js
	js/apps/system/aardvark/frontend/js/views/databaseView.js
This commit is contained in:
Frank Celler 2013-11-09 15:59:33 +01:00
parent eee23de5e0 28a9c5a44b
commit f458087e9d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -35,7 +35,8 @@ MAINTAINER = \
lib/V8/v8-json.h \
lib/BasicsC/voc-errors.h \
lib/BasicsC/voc-errors.c \
js/common/bootstrap/errors.js
js/common/bootstrap/errors.js \
mr/common/bootstrap/mr-error.h
AUTOMAGIC = \
Makefile.in \

5
Installation/release.sh
View File

@ -41,6 +41,11 @@ mv configure.ac.tmp configure.ac
make built-sources || exit 1
make add-maintainer || exit 1
make add-automagic || exit 1
make || exit 1
make examples || exit 1
make swagger || exit 1
make doxygen || exit 1
make latex || exit 1