[fltk/f20: 4/4] Merge branch 'master' into f20
Rex Dieter
rdieter at fedoraproject.org
Tue Feb 25 16:03:31 UTC 2014
commit dc637bed2e6be963c461bdaee6cf786f407ffff4
Merge: 2e240b6 f272280
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Feb 25 10:04:08 2014 -0600
Merge branch 'master' into f20
Conflicts:
fltk.spec
fltk-1.3.x-r9671-clipboard-xfixes.patch | 156 --------------
fltk-1_v6.3.x-clipboard-x11.patch | 355 +++++++++++++++++++++++++++++++
fltk.spec | 10 +-
3 files changed, 361 insertions(+), 160 deletions(-)
---
More information about the scm-commits
mailing list