GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '2.4.3' into lexer2

Browse source
This commit is contained in:
Paul Beckingham 2015-03-20 17:16:48 -04:00
commit 24a1cbefe9
49 changed files with 876 additions and 850 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/CmdExport.cpp
View file

@ -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;

5
src/commands/CmdVersion.cpp
View file

@ -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