7 Commits

Author	SHA1	Message	Date
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
Frank Celler	973f9aa2fb	added linenoise	2014-01-30 17:23:24 +01:00
Jan Steemann	894ea527a6	testing readline...	2014-01-27 17:06:27 +01:00
Jan Steemann	bae529c4e4	testing readline...	2014-01-27 17:04:27 +01:00
Jan Steemann	2ced0f6a21	fixed terminal reset	2014-01-27 16:54:48 +01:00
Frank Celler	84507cfc44	merged changes from 1.4 back to devel	2013-12-27 14:59:23 +01:00
Frank Celler	86b7fea992	Vs2013	2013-12-07 18:55:55 +01:00