Automated merge with http://hg.netbeans.org/main/contrib
authorS. Aubrecht <saubrecht@netbeans.org>
Fri, 11 Jan 2013 18:31:02 +0100
changeset 1791741056598da26
parent 17915 3cdba0929c4e
parent 17916 c3834f3fffaf
child 17919 6ac43eb330ca
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/nimbus.theme/build.xml	Fri Jan 11 15:06:14 2013 +0100
     1.2 +++ b/nimbus.theme/build.xml	Fri Jan 11 18:31:02 2013 +0100
     1.3 @@ -2,7 +2,7 @@
     1.4  <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
     1.5  <!-- for some information on what you could do (e.g. targets to override). -->
     1.6  <!-- If you delete this file and reopen the project it will be recreated. -->
     1.7 -<project name="org.netbeans.nimbus.theme" default="netbeans" basedir=".">
     1.8 -    <description>Builds, tests, and runs the project org.netbeans.nimbus.theme.</description>
     1.9 +<project name="org.netbeans.modules.nimbus.theme" default="netbeans" basedir=".">
    1.10 +    <description>Builds, tests, and runs the project org.netbeans.modules.nimbus.theme.</description>
    1.11      <import file="nbproject/build-impl.xml"/>
    1.12  </project>
     2.1 --- a/nimbus.theme/nbproject/build-impl.xml	Fri Jan 11 15:06:14 2013 +0100
     2.2 +++ b/nimbus.theme/nbproject/build-impl.xml	Fri Jan 11 18:31:02 2013 +0100
     2.3 @@ -3,7 +3,7 @@
     2.4  *** GENERATED FROM project.xml - DO NOT EDIT  ***
     2.5  ***         EDIT ../build.xml INSTEAD         ***
     2.6  -->
     2.7 -<project name="org.netbeans.nimbus.theme-impl" basedir="..">
     2.8 +<project name="org.netbeans.modules.nimbus.theme-impl" basedir="..">
     2.9      <fail message="Please build using Ant 1.7.1 or higher.">
    2.10          <condition>
    2.11              <not>
     3.1 --- a/nimbus.theme/nbproject/genfiles.properties	Fri Jan 11 15:06:14 2013 +0100
     3.2 +++ b/nimbus.theme/nbproject/genfiles.properties	Fri Jan 11 18:31:02 2013 +0100
     3.3 @@ -1,8 +1,8 @@
     3.4 -build.xml.data.CRC32=6537529f
     3.5 -build.xml.script.CRC32=06b97986
     3.6 +build.xml.data.CRC32=eecfb3c7
     3.7 +build.xml.script.CRC32=006b99ae
     3.8  build.xml.stylesheet.CRC32=a56c6a5b@2.50.1
     3.9  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    3.10  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    3.11 -nbproject/build-impl.xml.data.CRC32=6537529f
    3.12 -nbproject/build-impl.xml.script.CRC32=bae4e29e
    3.13 +nbproject/build-impl.xml.data.CRC32=eecfb3c7
    3.14 +nbproject/build-impl.xml.script.CRC32=f2511101
    3.15  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
     4.1 --- a/nimbus.theme/nbproject/project.properties	Fri Jan 11 15:06:14 2013 +0100
     4.2 +++ b/nimbus.theme/nbproject/project.properties	Fri Jan 11 18:31:02 2013 +0100
     4.3 @@ -4,7 +4,7 @@
     4.4  nbm.homepage=www.netbeans.org
     4.5  nbm.module.author=S. Aubrecht
     4.6  nbm.needs.restart=true
     4.7 -spec.version.base=1.0
     4.8 +spec.version.base=1.1
     4.9  run.args.extra=--laf Nimbus
    4.10  keystore=nbproject/private/keystore
    4.11 -nbm_alias=myself
    4.12 \ No newline at end of file
    4.13 +nbm_alias=myself
     5.1 --- a/nimbus.theme/nbproject/project.xml	Fri Jan 11 15:06:14 2013 +0100
     5.2 +++ b/nimbus.theme/nbproject/project.xml	Fri Jan 11 18:31:02 2013 +0100
     5.3 @@ -11,7 +11,7 @@
     5.4                      <build-prerequisite/>
     5.5                      <compile-dependency/>
     5.6                      <run-dependency>
     5.7 -                        <specification-version>7.35</specification-version>
     5.8 +                        <specification-version>5.0</specification-version>
     5.9                      </run-dependency>
    5.10                  </dependency>
    5.11                  <dependency>
    5.12 @@ -19,7 +19,7 @@
    5.13                      <build-prerequisite/>
    5.14                      <compile-dependency/>
    5.15                      <run-dependency>
    5.16 -                        <specification-version>8.29</specification-version>
    5.17 +                        <specification-version>5.0</specification-version>
    5.18                      </run-dependency>
    5.19                  </dependency>
    5.20              </module-dependencies>