commit a5f6df7704aa602cb208bdb9345221378cbc0ea2 Merge: ae00fdb 426c38d Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 22:44:30 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kcachegrind.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---