Merge commit 'flame/master' into master
commit528baf4bdabd8a359f64d1a311825b426ac20faa
authorRiccardo Iaconelli <riccardo@kde.org>
Wed, 2 Jan 2008 17:32:50 +0000 (2 18:32 +0100)
committerRiccardo Iaconelli <riccardo@kde.org>
Wed, 2 Jan 2008 17:40:03 +0000 (2 18:40 +0100)
tree76fc406d8cfd66e2d4d8e4b026cbc31e24644508
parentf64c41c4ef3036c10d8cb926908a4b1f44bbbbbb
parent2055f5e45594c1ce0e4c0021b9fc28d33fb02c79
Merge commit 'flame/master' into master
Makefile.colors