commit 50ecd41cde768acd5890272038ed0a0c180de337 Merge: 735eb25 e74a76b Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:34:32 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + kdesdk.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---