Jun Qian <jqian@netbeans.org> [Tue, 17 Mar 2009 14:23:36 -0700] rev 3861
Merge compapp.projects.base from 6.5 to main.
Jun Qian <jqian@netbeans.org> [Tue, 17 Mar 2009 09:16:36 -0700] rev 3860
Automated merge with http://hg.netbeans.org/main/
Jun Qian <jqian@netbeans.org> [Mon, 16 Mar 2009 13:22:39 -0700] rev 3859
Automated merge with http://hg.netbeans.org/main/
Jun Qian <jqian@netbeans.org> [Sat, 14 Mar 2009 01:16:35 -0700] rev 3858
Merging JBI base project from soa-dev65 to main.
Jun Qian <jqian@netbeans.org> [Sat, 14 Mar 2009 00:51:03 -0700] rev 3857
Fix broken unit test.
Jun Qian <jqian@netbeans.org> [Sat, 14 Mar 2009 00:24:45 -0700] rev 3856
Merging JBI Manager from soa-dev65 to main.
Michal Zlamal <mzlamal@netbeans.org> [Tue, 17 Mar 2009 14:27:38 +0100] rev 3855
Automated merge with http://hg.netbeans.org/main
Michal Zlamal <mzlamal@netbeans.org> [Tue, 17 Mar 2009 14:25:18 +0100] rev 3854
Resolve conflict
Jaroslav Tulach <jtulach@netbeans.org> [Tue, 17 Mar 2009 11:29:53 +0100] rev 3853
Manual merge with main-silver as there was conflict in MemoryValidationTest
Jaroslav Tulach <jtulach@netbeans.org> [Sat, 14 Mar 2009 06:14:53 +0100] rev 3852
Manual merge with main-silver. Accepting Vita's changes in MemoryValidationTest and using main-silver's version of PHPFormatter2.