commit cf353126bb1a3a424b52d571776644bc9c95b806 Merge: d84b899 ab559f9 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Nov 8 14:09:46 2014 -0600 Merge branch 'master' into f20 .gitignore | 1 + libkdegames.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---