gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' (1.8.3) into 1.9.0

Browse Source 
Conflicts which were fixed:
	ChangeLog
	configure.ac
	doc/man/task-tutorial.5
	doc/man/task.1
	doc/man/taskrc.5
	src/report.cpp
This commit is contained in:
Federico Hernandez
2009-10-22 22:55:01 +02:00
parent d321ee242d e2e0851a69
commit bf077c0f97
16 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Table.cpp
View File

@@ -771,7 +771,7 @@ void Table::sort (std::vector <int>& order)
if (gap > 1)
{
gap = (int) ((float)gap / 1.3);
if (gap == 10 or gap == 9)
if (gap == 10 || gap == 9)
gap = 11;
}