Automated merge with http://hg.netbeans.org/main/contrib
authorMartin Fousek <marfous@netbeans.org>
Thu, 06 Jan 2011 11:38:47 +0100
changeset 17271947b58de7d59
parent 17269 a1101402cc19
parent 17270 bddc081c7279
child 17274 c36a857fe9a8
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/regextester/nbproject/project.properties	Wed Jan 05 23:03:32 2011 +0100
     1.2 +++ b/regextester/nbproject/project.properties	Thu Jan 06 11:38:47 2011 +0100
     1.3 @@ -0,0 +1,2 @@
     1.4 +javac.compilerargs=-Xlint -Xlint:-serial
     1.5 +javac.source=1.5
     2.1 --- a/regextester/nbproject/project.xml	Wed Jan 05 23:03:32 2011 +0100
     2.2 +++ b/regextester/nbproject/project.xml	Thu Jan 06 11:38:47 2011 +0100
     2.3 @@ -20,7 +20,16 @@
     2.4                      <compile-dependency/>
     2.5                      <run-dependency>
     2.6                          <release-version>3</release-version>
     2.7 -                    <specification-version>1.53</specification-version>
     2.8 +                        <specification-version>1.53</specification-version>
     2.9 +                    </run-dependency>
    2.10 +                </dependency>
    2.11 +                <dependency>
    2.12 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
    2.13 +                    <build-prerequisite/>
    2.14 +                    <compile-dependency/>
    2.15 +                    <run-dependency>
    2.16 +                        <release-version>0-1</release-version>
    2.17 +                        <specification-version>1.0</specification-version>
    2.18                      </run-dependency>
    2.19                  </dependency>
    2.20                  <dependency>
    2.21 @@ -57,6 +66,14 @@
    2.22                      </run-dependency>
    2.23                  </dependency>
    2.24                  <dependency>
    2.25 +                    <code-name-base>org.openide.util.lookup</code-name-base>
    2.26 +                    <build-prerequisite/>
    2.27 +                    <compile-dependency/>
    2.28 +                    <run-dependency>
    2.29 +                        <specification-version>8.5</specification-version>
    2.30 +                    </run-dependency>
    2.31 +                </dependency>
    2.32 +                <dependency>
    2.33                      <code-name-base>org.openide.windows</code-name-base>
    2.34                      <build-prerequisite/>
    2.35                      <compile-dependency/>
    2.36 @@ -64,15 +81,6 @@
    2.37                          <specification-version>6.4</specification-version>
    2.38                      </run-dependency>
    2.39                  </dependency>
    2.40 -            <dependency>
    2.41 -                    <code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
    2.42 -                    <build-prerequisite/>
    2.43 -                    <compile-dependency/>
    2.44 -                    <run-dependency>
    2.45 -                        <release-version>0-1</release-version>
    2.46 -                        <specification-version>1.0</specification-version>
    2.47 -                    </run-dependency>
    2.48 -                </dependency>
    2.49              </module-dependencies>
    2.50              <public-packages/>
    2.51          </data>