1
0
Fork 0
arangodb/3rdParty
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
..
V8 added armv7 2013-10-13 10:47:48 +02:00
boost_1_55_0 Windows fixes 2014-01-27 13:34:56 +01:00
icu added missing file 2013-10-26 17:09:39 +02:00
libev don't generate pod2man 2013-09-05 14:23:50 +02:00
linenoise fixed warning 2014-01-30 17:36:14 +01:00
mruby updated mruby to 2013-08-22 2013-08-22 21:03:04 +02:00
ptmalloc3
valgrind
zlib-1.2.7 removed generated file 2013-10-13 10:48:05 +02:00
.gitignore
Makefile.all-in-one-icu Sort out "make distclean" to correctly delegate to icu. 2013-11-11 14:37:30 +01:00
Makefile.all-in-one-libev
Makefile.all-in-one-mruby
Makefile.all-in-one-v8 added modifications for raspberry 2013-10-13 10:48:58 +02:00
Makefile.zlib