[qsstv/el6: 18/18] Fix spec file conflicts

Mon Mar 2 19:31:16 UTC 2015

commit a1220db1f528cfdcd5c6378fab7e3a2e8532f6d2
Merge: c928057 f8258c1
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 2 13:31:09 2015 -0600

    Fix spec file conflicts

 .gitignore                    |   8 +++
 ChangeLog                     | 125 ++++++++++++++++++++++++++++++++++++++++++
 qsstv-fix-html-doc-path.patch |  24 --------
 qsstv-fix-target-path.patch   |  14 -----
 qsstv-gcc47_unistd.patch      |  20 -------
 qsstv.spec                    |  95 ++++++++++++++++++++++----------
 sources                       |   2 +-
 7 files changed, 200 insertions(+), 88 deletions(-)
---