commit 6aa044dacf345a44196e35ba5b6115f47143301f Merge: 62df748 254c5a2 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 20:17:06 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kdegames.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---