| commit | d4e99c572873254faa038726e8f874a165c12de7 | |
| author | Riccardo Iaconelli <riccardo@kde.org> | |
| Fri, 28 Dec 2007 19:13:24 +0000 (28 20:13 +0100) | ||
| committer | Riccardo Iaconelli <riccardo@kde.org> | |
| Fri, 28 Dec 2007 19:13:24 +0000 (28 20:13 +0100) | ||
| tree | e6278c007c0ab029f27459514538d970f5e565b8 | treesnapshot (tar.gz zip) |
| parent | 21489c13e8798539818d97bad8b1b510cff2123f | commitdiff |
| parent | 93a8c7791d545c05990545f6fa44017df3b6a280 | commitdiff |
Merge commit 'flame/master'
Conflicts:
Makefile
Makefile.colors
Conflicts:
Makefile
Makefile.colors
| Makefile | diff1 | diff2 | blobhistory |
| Makefile.colors | diff1 | diff2 | blobhistory |