Merge branch '2.4.3' into lexer2
This commit is contained in:
@@ -54,7 +54,7 @@ int CmdExport::execute (std::string& output)
|
||||
// Apply filter.
|
||||
Filter filter;
|
||||
std::vector <Task> filtered;
|
||||
filter.subset (filtered);
|
||||
filter.subset (filtered, false);
|
||||
|
||||
// Obey 'limit:N'.
|
||||
int rows = 0;
|
||||
|
||||
@@ -135,7 +135,10 @@ CmdCompletionVersion::CmdCompletionVersion ()
|
||||
int CmdCompletionVersion::execute (std::string& output)
|
||||
{
|
||||
#ifdef HAVE_COMMIT
|
||||
output = COMMIT;
|
||||
output = std::string (VERSION)
|
||||
+ std::string (" (")
|
||||
+ std::string (COMMIT)
|
||||
+ std::string (")");
|
||||
#else
|
||||
output = VERSION;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user