commit ce7155079e4b995b0284c2972b1fd7a6ba50d4f6
Merge: 42d477a fc875d8
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 16:57:32 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
libkmahjongg.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---