[paraview/epel7: 6/6] Update to 4.2.0 from master

[Orion Poplawski]

commit 54bcd2f80ce389cc45f8f303929bc61c949515eb
Merge: 0cd8df2 274fa56
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Oct 2 08:57:50 2014 -0600

    Update to 4.2.0 from master

 .gitignore                            |    2 +
 paraview-4.0.1-Protobuf.patch         |   72 ---------------------------------
 paraview-pqViewFrameActionGroup.patch |   11 -----
 paraview.spec                         |   71 +++++++++++++++++++-------------
 sources                               |    2 +-
 5 files changed, 46 insertions(+), 112 deletions(-)
---