1
0
Fork 0
arangodb/Installation/MacOSX/MacPorts
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
2012-08-18 09:00:43 +02:00
..
Portfile fixed for issue #149: Inconsistent port for admin interface 2012-08-10 13:59:39 +02:00
arango.conf fixed for issue #149: Inconsistent port for admin interface 2012-08-10 13:59:39 +02:00
org.arangodb.plist renamed Avocado to Arango 2012-05-12 14:51:33 +02:00