Merge branch '2.4.0' of ssh://git.tasktools.org/tm/task into 2.4.0

Conflicts:
	doc/rc/dark-16.theme
	doc/rc/dark-256.theme
	doc/rc/dark-blue-256.theme
	doc/rc/dark-gray-256.theme
	doc/rc/dark-gray-blue-256.theme
	doc/rc/dark-green-256.theme
	doc/rc/dark-red-256.theme
	doc/rc/light-16.theme
	doc/rc/light-256.theme
	doc/rc/solarized-dark-256.theme
	doc/rc/solarized-light-256.theme
This commit is contained in:
Paul Beckingham 2015-01-01 13:27:10 -05:00
commit 7bcec61c53
567 changed files with 580 additions and 578 deletions

View file

@ -1,4 +1,4 @@
###############################################################################
################################################################################
#
# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
#