[eclipse-collabnet-merge: 2/2] Update to latest upstream.

[Krzysztof Daniel]

commit 24d2cf169266be9b173f9f4dc0d17a8ada0fa524
Merge: 804c9db 9def86b
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Jun 28 10:26:42 2013 +0200

    Update to latest upstream.

 .gitignore                   |    2 ++
 eclipse-collabnet-merge.spec |    8 +++++---
 get-collabnet-merge.sh       |    2 +-
 sources                      |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 05abd2b,b82fc4f..fe57d12
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,2 +1,7 @@@
 +collabnet-merge-2.0.0.tar.gz
 +collabnet-merge-2.2.1.tar.gz
 +/collabnet-merge-3.0.9.tar.gz
 +/collabnet-merge-3.7.0.tar.gz
 +/collabnet-merge-3.7.0
+ /collabnet-merge-4.0.0.tar.gz
+ /collabnet-merge-4.0.0
diff --cc eclipse-collabnet-merge.spec
index 8b43ece,29a6ec7..08d2f22
--- a/eclipse-collabnet-merge.spec
+++ b/eclipse-collabnet-merge.spec
@@@ -69,7 -68,7 +68,10 @@@ unzip -q -n -d %{buildroot}%{eclipse_dr
  %doc com.collabnet.subversion.merge.feature/license.html
  
  %changelog
 -* Wed Jun 19 2013 Krzysztof Daniel <kdaniel at redhat.com> 4.0.0-1
++* Fri Jun 28 2013 Krzysztof Daniel <kdaniel at redhat.com> 4.0.0-1
++- Update to latest upstream.
++
 +* Wed Jun 19 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
  - Update to latest upstream.
  
  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.9-2