[libkscreen/f19: 9/9] Merge branch 'master' into f19

[Rex Dieter]

commit 4975eaafd6e70d3461cda25eec30c1d73e6cdf69
Merge: cab1aa6 d531d36
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 1 17:11:03 2014 -0500

    Merge branch 'master' into f19

 .gitignore                             |    9 +----
 libkscreen-1.0.5-VERSION_RELEASE.patch |   12 ++++++
 libkscreen.spec                        |   62 ++++++++++++++++++++++++++-----
 sources                                |    2 +-
 4 files changed, 67 insertions(+), 18 deletions(-)
---