1
0
Fork 0
Commit Graph

4 Commits

Author SHA1 Message Date
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00