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 1

Merge branch '2.2.0' of tasktools.org:task into 2.2.0

Browse source
This commit is contained in:
Paul Beckingham 2013-03-02 10:59:46 -05:00
commit 8e536fa4a8
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS
View file

@ -81,6 +81,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
Justin Forest
Vincent Petithory
Rainer Müller
Jakub Wilk
Thanks to the following, who submitted detailed bug reports and excellent
suggestions:
@ -167,3 +168,4 @@ suggestions:
trHD
Benjamin Weber
alparo

2
ChangeLog
View file

@ -81,6 +81,8 @@ Bugs
+ Fixed bug #1154, which now allows priorities to be specified in any case.
+ Fixed bug #1178, which included binary libraries in the released source
package (thanks to Jakub Wilk).
+ Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
+ Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk).
+ Improved hyphenation by splitting on commas (even if no whitespace after).
Leads to better output of, for example, 'task show', where comma-separated
lists are common.

3
doc/man/task.1.in
View file

@ -983,7 +983,8 @@ Taskwarrior stores its configuration in a file in the user's home directory:
.B task rc:<path-to-alternate-file> ...
Specifies an alternate configuration file.
.TP TASKRC=/tmp/.taskrc task ..
.TP
.B TASKRC=/tmp/.taskrc task ..
The environment variable overrides the default and the command line
specification of the .taskrc file.

8
src/columns/Column.cpp
View file

@ -301,28 +301,28 @@ bool Column::validate (std::string& input)
// No L10N.
void Column::measure (const std::string&, unsigned int&, unsigned int&)
{
throw std::string ("Virtual method Column::measure not overriden.");
throw std::string ("Virtual method Column::measure not overridden.");
}
////////////////////////////////////////////////////////////////////////////////
// No L10N.
void Column::measure (Task&, unsigned int&, unsigned int&)
{
throw std::string ("Virtual method Column::measure not overriden.");
throw std::string ("Virtual method Column::measure not overridden.");
}
////////////////////////////////////////////////////////////////////////////////
// No L10N.
void Column::render (std::vector <std::string>&, const std::string&, int, Color&)
{
throw std::string ("Virtual method Column::render not overriden.");
throw std::string ("Virtual method Column::render not overridden.");
}
////////////////////////////////////////////////////////////////////////////////
// No L10N.
void Column::render (std::vector <std::string>&, Task&, int, Color&)
{
throw std::string ("Virtual method Column::render not overriden.");
throw std::string ("Virtual method Column::render not overridden.");
}
////////////////////////////////////////////////////////////////////////////////