Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql2

This commit is contained in:
Max Neunhoeffer 2014-07-30 09:32:26 +02:00
parent f078425b6d 728a439d3f
commit 8f1945bba7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Utilities/ShellImplFactory.cpp
View File

@ -30,9 +30,9 @@
#ifdef _WIN32 #ifdef _WIN32
#include "LinenoiseShell.h" #include "LinenoiseShell.h"
#elif TRI_HAVE_LINENOISE #elif defined TRI_HAVE_LINENOISE
#include "LinenoiseShell.h" #include "LinenoiseShell.h"
#elif TRI_HAVE_READLINE #elif defined TRI_HAVE_READLINE
#include "ReadlineShell.h" #include "ReadlineShell.h"
#else #else
#include "DummyShell.h" #include "DummyShell.h"