commit 0465ac5043940e434f9e00a4edc39f0384deaad9 Merge: d0acc88 384ffd0 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 16:57:01 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ libkdegames.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---