Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/js
History
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 		2013-01-05 11:16:50 +01:00
..
actions/system Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-05 11:16:50 +01:00
client Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-05 11:16:50 +01:00
common Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-05 11:16:50 +01:00
server Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-05 11:16:50 +01:00
Makefile.files Merge remote-tracking branch 'origin/issue317' into 1.1 2013-01-03 18:57:18 +01:00