Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel ... Conflicts: Documentation/Examples/shell-read-document-bad-handle Makefile.in arangod/Documentation/shell-document.dox configure js/actions/system/api-collection.js js/actions/system/api-index.js js/actions/system/api-system.js js/common/bootstrap/modules.js js/common/bootstrap/print.js js/server/ArangoCollection.js lib/V8/v8-utils.cpp		2013-01-09 15:30:21 +01:00
..
associative-multi.c	ifdef'd statistics	2012-10-23 11:55:24 +02:00
associative-multi.h	ifdef'd statistics	2012-10-23 11:55:24 +02:00
associative.c	some refactoring of v8-vocbase, trx integration	2012-11-06 19:02:09 +01:00
associative.h	some refactoring of v8-vocbase, trx integration	2012-11-06 19:02:09 +01:00
common.h	windows version	2012-12-06 20:44:01 +08:00
conversions.c	fixed octal conversion, wrote tests	2012-11-08 15:07:48 +01:00
conversions.h	fixed octal conversion, wrote tests	2012-11-08 15:07:48 +01:00
csv.c	cppcheck	2012-12-18 16:44:06 +01:00
csv.h	…
error.c	…
error.h	…
errors.dat	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2013-01-05 11:16:50 +01:00
files.c	Merge remote-tracking branch 'origin/1.1' into devel	2013-01-09 15:30:21 +01:00
files.h	Merge remote-tracking branch 'origin/1.1' into devel	2013-01-09 15:30:21 +01:00
fsrt.inc	fulltext index massive rewrite	2012-12-15 01:01:25 +01:00
hashes.c	fixed some issues reported by cppcheck	2012-12-12 18:42:11 +01:00
hashes.h	…
init.c	…
init.h	…
json-utilities.c	fulltext index massive rewrite	2012-12-15 01:01:25 +01:00
json-utilities.h	…
json.c	windows version	2012-12-06 20:44:01 +08:00
json.h	…
linked-list.c	intptr_t to uintptr_t conversion	2013-01-02 15:00:59 +01:00
linked-list.h	…
local-configuration.h.in	added --enable-trx option	2012-10-31 11:21:06 +01:00
locks-macos.c	…
locks-macos.h	…
locks-posix.c	fixed merge conflicts	2013-01-02 18:07:57 +01:00
locks-posix.h	…
locks-win32.c	fixed merge conflicts	2013-01-02 18:07:57 +01:00
locks-win32.h	…
locks.h	added #error markers for Windows	2012-12-10 15:50:02 +01:00
logging.c	cppcheck	2013-01-07 22:37:52 +01:00
logging.h	windows fixes	2012-12-20 17:17:30 +08:00
memory-map-posix.c	memory collections, intermediate commit	2013-01-04 15:50:29 +01:00
memory-map-posix.h	…
memory-map-win32.c	windows version	2012-12-06 20:44:01 +08:00
memory-map-win32.h	windows version	2012-12-06 20:44:01 +08:00
memory-map.h	windows version	2012-12-06 20:44:01 +08:00
memory.c	a few small fixes for logging	2013-01-03 14:47:16 +01:00
memory.h	…
mersenne.c	…
mersenne.h	…
messages.h	…
operating-system.h	in-memory collections, seem to work now	2013-01-04 17:04:15 +01:00
process-utils.c	…
process-utils.h	…
random.c	fixed some issues reported by cppcheck	2012-12-12 18:42:11 +01:00
random.h	…
socket-utils.c	…
socket-utils.h	…
string-buffer.c	cppcheck	2013-01-07 22:37:52 +01:00
string-buffer.h	…
strings.c	fulltext index massive rewrite	2012-12-15 01:01:25 +01:00
strings.h	fixed merge conflicts	2013-01-02 18:07:57 +01:00
structures.c	fixed typos	2012-12-11 18:57:50 +01:00
structures.h	…
system-compiler.h	…
system-functions.c	…
system-functions.h	…
terminal-utils-posix.c	…
terminal-utils-win32.c	…
terminal-utils.c	cppcheck	2013-01-07 22:37:52 +01:00
terminal-utils.h	…
threads-posix.c	cppcheck	2013-01-07 22:37:52 +01:00
threads-posix.h	…
threads-win32.c	test	2012-12-10 19:42:50 +08:00
threads-win32.h	…
threads.h	…
timer.h	…
utf8-helper.c	fixed some issues reported by cppcheck	2012-12-12 18:42:11 +01:00
utf8-helper.h	fulltext index massive rewrite	2012-12-15 01:01:25 +01:00
vector.c	cppcheck	2013-01-07 22:37:52 +01:00
vector.h	fulltext index massive rewrite	2012-12-15 01:01:25 +01:00
voc-errors.c	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2013-01-05 11:16:50 +01:00
voc-errors.h	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2013-01-05 11:16:50 +01:00
win-utils.c	cppcheck	2013-01-07 22:37:52 +01:00
win-utils.h	windows fixes	2012-12-20 17:17:30 +08:00