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

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

Browse source
This commit is contained in:
Federico Hernandez 2010-10-06 00:25:12 +02:00
commit 9e9807a52a
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -20,5 +20,5 @@ i18ndir = $(docdir)
nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE
rcfiledir = $(docdir)/rc
dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-CA.rc doc/rc/holidays-SE.rc doc/rc/holidays-DE.rc doc/rc/holidays-FR.rc doc/rc/holidays-UK.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme
dist_rcfile_DATA = doc/rc/holidays-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-NL.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme

2
doc/rc/dark-256.theme
View file

@ -60,7 +60,7 @@ color.pri.H=color255
color.pri.M=color250
color.pri.L=color245
color.tagged=rgb031
color.blocked=on gray4
color.blocked=white on color8
color.project.none=
color.tag.none=
color.alternate=on color233

2
doc/rc/dark-blue-256.theme
View file

@ -60,7 +60,7 @@ color.pri.H=rgb035
color.pri.M=rgb025
color.pri.L=rgb015
color.tagged=color246
color.blocked=on gray4
color.blocked=white on rgb001
color.project.none=
color.tag.none=
color.alternate=on color233

2
doc/rc/dark-green-256.theme
View file

@ -60,7 +60,7 @@ color.pri.H=rgb050
color.pri.M=rgb030
color.pri.L=rgb010
color.tagged=color246
color.blocked=on gray4
color.blocked=white on rgb010
color.project.none=
color.tag.none=
color.alternate=on color233

2
doc/rc/dark-red-256.theme
View file

@ -60,7 +60,7 @@ color.pri.H=rgb500
color.pri.M=rgb400
color.pri.L=rgb300
color.tagged=color246
color.blocked=on gray4
color.blocked=white on rgb100
color.project.none=
color.tag.none=
color.alternate=on color233

2
doc/rc/dark-violets-256.theme
View file

@ -60,7 +60,7 @@ color.pri.H=rgb404
color.pri.M=rgb304
color.pri.L=rgb325
color.tagged=rgb334
color.blocked=on gray4
color.blocked=white on rgb101
color.project.none=
color.tag.none=
color.alternate=on gray2

2
doc/rc/dark-yellow-green.theme
View file

@ -60,7 +60,7 @@ color.pri.H=rgb450
color.pri.M=rgb030
color.pri.L=rgb010
color.tagged=rgb342
color.blocked=on gray4
color.blocked=white on rgb110
color.project.none=
color.tag.none=
color.alternate=on gray0

2
doc/rc/light-16.theme
View file

@ -60,7 +60,7 @@ color.pri.H=bold black
color.pri.M=black
color.pri.L=
color.tagged=green
color.blocked=black on white
color.blocked=white on black
color.project.none=
color.tag.none=
color.alternate=

2
doc/rc/light-256.theme
View file

@ -59,7 +59,7 @@ color.pri.H=color232
color.pri.M=color237
color.pri.L=color242
color.tagged=rgb020
color.blocked=on gray4
color.blocked=gray12 on gray4
color.project.none=
color.tag.none=
color.alternate=on color254

2
src/TDB.cpp
View file

@ -1535,7 +1535,7 @@ void TDB::merge (const std::string& mergeFile)
}
// write undo file
if (! File::write (undoFile, undo, false))
if (! File::write (undoFile, undo, true))
throw std::string ("Could not write '") + undoFile + "'.";
}
else // nothing to be done