6 Commits

Author	SHA1	Message	Date
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
Frank Celler	812360145e	added flush	2013-01-09 11:47:17 +01:00
Frank Celler	f5b1476d78	fixed jslint warnings	2013-01-06 11:05:28 +01:00
Frank Celler	fb881581e1	fixed GUI	2013-01-06 01:31:32 +01:00
Frank Celler	3826a4603e	removed print.js	2013-01-06 00:23:40 +01:00
Frank Celler	337cee7606	fixed jslint warnings	2013-01-05 23:59:44 +01:00