[eclipse-subclipse: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse-subclipse

[Alexander Kurtakov]

commit 99fa2432c7fd33755e60d8c4ffaa6cc3fa7faec3
Merge: 9162eaa 8a990fb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Feb 25 11:26:04 2011 +0200

    Merge branch 'master' of
    ssh://pkgs.fedoraproject.org/eclipse-subclipse
    
    Conflicts:
    	eclipse-subclipse.spec

 eclipse-subclipse.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc eclipse-subclipse.spec
index 05fce96,c434c9c..35fcd34
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@@ -3,10 -3,12 +3,12 @@@
  %global install_loc        %{_datadir}/eclipse/dropins
  %global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.6.15
  
+ # Add a comment to have something to commit to try to reproduce Adam
+ # Williamson's deadlock bug.
  
  Name:           eclipse-subclipse
 -Version:        1.6.16
 -Release:        2%{?dist}
 +Version:        1.6.17
 +Release:        1%{?dist}
  Summary:        Subversion Eclipse plugin
  
  Group:          Development/Tools
@@@ -109,9 -112,9 +111,12 @@@ ln -s %{_javadir}/svn-javahl.jar $insta
  
  
  %changelog
 +* Fri Feb 25 2011 Alexander Kurtakov <akurtako at redhat.com> 1.6.17-1
 +- Update to 1.6.17.
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.16-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Dec 14 2010 Alexander Kurtakov <akurtako at redhat.com> 1.6.16-1
  - Update to 1.6.16.