Automated merge with file:///work/netbeans/jet-main
authorVita Stejskal <vstejskal@netbeans.org>
Fri, 16 Jul 2010 12:36:26 +0200
changeset 4016af20253362d1
parent 4009 ad83b8d9a541
parent 4015 852a76722d4b
child 4017 d5b729603a1e
Automated merge with file:///work/netbeans/jet-main
bpel.debugger.ui/nbproject/project.xml
compapp.casaeditor/nbproject/project.xml
compapp.projects.base/nbproject/project.xml
compapp.projects.jbi/nbproject/project.xml
xslt.core/nbproject/project.xml
     1.1 --- a/bpel.debugger.ui/nbproject/project.xml	Wed Jul 07 11:33:54 2010 -0400
     1.2 +++ b/bpel.debugger.ui/nbproject/project.xml	Fri Jul 16 12:36:26 2010 +0200
     1.3 @@ -267,6 +267,15 @@
     1.4                          <specification-version>6.5.22</specification-version>
     1.5                      </run-dependency>
     1.6                  </dependency>
     1.7 +                <dependency>
     1.8 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
     1.9 +                    <build-prerequisite/>
    1.10 +                    <compile-dependency/>
    1.11 +                    <run-dependency>
    1.12 +                        <release-version>0-1</release-version>
    1.13 +                        <specification-version>1.0</specification-version>
    1.14 +                    </run-dependency>
    1.15 +                </dependency>
    1.16              </module-dependencies>
    1.17              <public-packages/>
    1.18          </data>
     2.1 --- a/xslt.core/nbproject/project.xml	Wed Jul 07 11:33:54 2010 -0400
     2.2 +++ b/xslt.core/nbproject/project.xml	Fri Jul 16 12:36:26 2010 +0200
     2.3 @@ -339,6 +339,15 @@
     2.4                          <specification-version>6.5.22</specification-version>
     2.5                      </run-dependency>
     2.6                  </dependency>
     2.7 +                <dependency>
     2.8 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
     2.9 +                    <build-prerequisite/>
    2.10 +                    <compile-dependency/>
    2.11 +                    <run-dependency>
    2.12 +                        <release-version>0-1</release-version>
    2.13 +                        <specification-version>1.0</specification-version>
    2.14 +                    </run-dependency>
    2.15 +                </dependency>
    2.16              </module-dependencies>
    2.17              <public-packages/>
    2.18          </data>