Tue, 14 Apr 2009 17:54:48 +0200Automated merge with http://hg.netbeans.org/main/
jbranam@netbeans.org [Tue, 14 Apr 2009 17:54:48 +0200] rev 2860
Automated merge with http://hg.netbeans.org/main/

Tue, 14 Apr 2009 17:43:16 +0200More progress on moving Web Helpset. Updated TOCs JHMs Bundled Props, etc. Fixed interhelpset links, wtc
jbranam@netbeans.org [Tue, 14 Apr 2009 17:43:16 +0200] rev 2859
More progress on moving Web Helpset. Updated TOCs JHMs Bundled Props, etc. Fixed interhelpset links, wtc

Fri, 10 Apr 2009 19:32:11 +0200Improving module display names
pjiricka@netbeans.org [Fri, 10 Apr 2009 19:32:11 +0200] rev 2858
Improving module display names

Thu, 02 Apr 2009 20:05:54 -0400Using #161286 (Services tab declarative registration) in some extra modules.
Jesse Glick <jglick@netbeans.org> [Thu, 02 Apr 2009 20:05:54 -0400] rev 2857
Using #161286 (Services tab declarative registration) in some extra modules.

Mon, 30 Mar 2009 17:57:17 -0400Fixing BundleKeysTest, incl. updating some jellytools operators, and deleting some obsolete operators and tests.
Jesse Glick <jglick@netbeans.org> [Mon, 30 Mar 2009 17:57:17 -0400] rev 2856
Fixing BundleKeysTest, incl. updating some jellytools operators, and deleting some obsolete operators and tests.

Tue, 17 Mar 2009 14:27:38 +0100Automated merge with http://hg.netbeans.org/main golden release67_m3_base
Michal Zlamal <mzlamal@netbeans.org> [Tue, 17 Mar 2009 14:27:38 +0100] rev 2855
Automated merge with http://hg.netbeans.org/main

Tue, 17 Mar 2009 14:25:18 +0100Resolve conflict
Michal Zlamal <mzlamal@netbeans.org> [Tue, 17 Mar 2009 14:25:18 +0100] rev 2854
Resolve conflict

Tue, 17 Mar 2009 11:29:53 +0100Manual merge with main-silver as there was conflict in MemoryValidationTest
Jaroslav Tulach <jtulach@netbeans.org> [Tue, 17 Mar 2009 11:29:53 +0100] rev 2853
Manual merge with main-silver as there was conflict in MemoryValidationTest

Sat, 14 Mar 2009 06:14:53 +0100Manual merge with main-silver. Accepting Vita's changes in MemoryValidationTest and using main-silver's version of PHPFormatter2.
Jaroslav Tulach <jtulach@netbeans.org> [Sat, 14 Mar 2009 06:14:53 +0100] rev 2852
Manual merge with main-silver. Accepting Vita's changes in MemoryValidationTest and using main-silver's version of PHPFormatter2.

Wed, 11 Mar 2009 15:21:59 +0100creating started set of javahelp pages in web.helpset
mkuchtiak@netbeans.org [Wed, 11 Mar 2009 15:21:59 +0100] rev 2851
creating started set of javahelp pages in web.helpset