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
..
acx_pthread.m4	…
all-in-one.boost	Try to add boost libraries for shared_ptr.	2014-01-27 11:38:59 +01:00
all-in-one.icu	TRI_HAVE_ICU is now longer used	2014-01-11 12:00:39 +01:00
all-in-one.libev	…
all-in-one.mruby	…
all-in-one.v8	…
all-in-one.zlib	…
ax_boost_base.m4	Try to add boost libraries for shared_ptr.	2014-01-27 11:38:59 +01:00
ax_cxx_check_lib.m4	…
ax_prog_gperf.m4	…
configure.basics	…
configure.cluster	added configure option --enable-cluster	2013-12-10 14:46:16 +01:00
configure.coverage	…
configure.documentation	…
configure.information	…
configure.largefile	…
configure.logging	…
configure.maintainer	…
configure.threads	…
external.boost	Try to add boost libraries for shared_ptr.	2014-01-27 11:38:59 +01:00
external.icu	TRI_HAVE_ICU is now longer used	2014-01-11 12:00:39 +01:00
external.libev	fixed check for libev	2014-01-13 19:58:18 +01:00
external.math	…
external.openssl	…
external.readline	added linenoise	2014-01-30 17:23:24 +01:00
external.v8	fixed V8 test	2014-01-13 22:32:47 +01:00