Fri, 19 Dec 2008 23:15:29 +0100Automated merge convertAsProperties_155962_base
ffjre@netbeans.org [Fri, 19 Dec 2008 23:15:29 +0100] rev 2809
Automated merge

Fri, 19 Dec 2008 10:47:35 -0500Normalizing Ant project names to match directory name.
Jesse Glick <jglick@netbeans.org> [Fri, 19 Dec 2008 10:47:35 -0500] rev 2808
Normalizing Ant project names to match directory name.

Fri, 19 Dec 2008 09:07:44 +0100Merge: manual due to conflict in nbbuild/build.xml
Jaroslav Tulach <jtulach@netbeans.org> [Fri, 19 Dec 2008 09:07:44 +0100] rev 2807
Merge: manual due to conflict in nbbuild/build.xml

Mon, 15 Dec 2008 08:34:49 +0100Merge with main-golden, manual due to conflicts in nbbuild/cluster.properties
Pavel Flaska <pflaska@netbeans.org> [Mon, 15 Dec 2008 08:34:49 +0100] rev 2806
Merge with main-golden, manual due to conflicts in nbbuild/cluster.properties

Wed, 10 Dec 2008 19:06:09 +0100Merge with main-golden, manual due to conflicts in nbbuild/cluster.properties
Pavel Flaska <pflaska@netbeans.org> [Wed, 10 Dec 2008 19:06:09 +0100] rev 2805
Merge with main-golden, manual due to conflicts in nbbuild/cluster.properties

Sat, 06 Dec 2008 20:02:28 +0100Merge with ergonomics
Jaroslav Tulach <jtulach@netbeans.org> [Sat, 06 Dec 2008 20:02:28 +0100] rev 2804
Merge with ergonomics

Sat, 06 Dec 2008 08:38:02 +0100Merge with my changes in icon registrations
Jaroslav Tulach <jtulach@netbeans.org> [Sat, 06 Dec 2008 08:38:02 +0100] rev 2803
Merge with my changes in icon registrations

Sat, 06 Dec 2008 11:02:52 +0100Automated merge with http://hg.netbeans.org/ergonomics
ffjre@netbeans.org [Sat, 06 Dec 2008 11:02:52 +0100] rev 2802
Automated merge with http://hg.netbeans.org/ergonomics

Sat, 06 Dec 2008 01:19:52 +0100Automated merge with http://hg.netbeans.org/ergonomics
ffjre@netbeans.org [Sat, 06 Dec 2008 01:19:52 +0100] rev 2801
Automated merge with http://hg.netbeans.org/ergonomics

Fri, 05 Dec 2008 01:36:07 +0100Automated merge with http://hg.netbeans.org/ergonomics
ffjre@netbeans.org [Fri, 05 Dec 2008 01:36:07 +0100] rev 2800
Automated merge with http://hg.netbeans.org/ergonomics