[nspluginwrapper/f13: 15/15] fixed conflicts

[Martin Stransky]

commit 66cbc53d43b48fec9f731eaea09e86cc3ca4ca6f
Merge: 640e957 b87202b
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu May 12 14:01:53 2011 +0200

    fixed conflicts

 .gitignore                                         |    1 +
 nspluginwrapper-1.3.0-comp.patch                   |   15 ++
 nspluginwrapper-1.3.0-configure.patch              |   22 ---
 nspluginwrapper-1.3.0-inst.patch                   |   12 --
 nspluginwrapper-1.3.0-make.patch                   |   63 +++----
 nspluginwrapper-1.3.0-timeout.patch                |   12 ++
 ...rapper-20090625-fix-npident-array-sending.patch |  178 --------------------
 nspluginwrapper.spec                               |   50 ++++---
 sources                                            |    2 +-
 9 files changed, 87 insertions(+), 268 deletions(-)
---