Automated merge with https://hg.netbeans.org/main/contrib/
authorJesse Glick <jglick@netbeans.org>
Tue, 01 May 2012 12:16:05 -0400
changeset 1782677535f5211c7
parent 17824 9a7b2044ac95
parent 17825 3ac0b733c804
child 17827 5ce4cdf53144
Automated merge with https://hg.netbeans.org/main/contrib/
     1.1 --- a/modulemanager/manifest.mf	Thu Apr 26 15:27:11 2012 +0200
     1.2 +++ b/modulemanager/manifest.mf	Tue May 01 12:16:05 2012 -0400
     1.3 @@ -2,4 +2,4 @@
     1.4  OpenIDE-Module: org.netbeans.modules.modulemanager/1
     1.5  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/modulemanager/Bundle.properties
     1.6  OpenIDE-Module-Layer: org/netbeans/modules/modulemanager/resources/mf-layer.xml
     1.7 -OpenIDE-Module-Specification-Version: 1.0
     1.8 +OpenIDE-Module-Specification-Version: 1.1
     2.1 --- a/modulemanager/src/org/netbeans/modules/modulemanager/ModuleBean.java	Thu Apr 26 15:27:11 2012 +0200
     2.2 +++ b/modulemanager/src/org/netbeans/modules/modulemanager/ModuleBean.java	Tue May 01 12:16:05 2012 -0400
     2.3 @@ -813,9 +813,6 @@
     2.4                          }
     2.5                      }
     2.6                  }
     2.7 -                // Try to enable a subset this time.
     2.8 -                realModules.remove(realModules);
     2.9 -                doEnable(realModules);
    2.10              }
    2.11          }
    2.12