Vita Stejskal <vstejskal@netbeans.org> [Mon, 03 Nov 2008 19:06:46 +0100] rev 2946
Automated merge with http://hg.netbeans.org/main
Vita Stejskal <vstejskal@netbeans.org> [Fri, 24 Oct 2008 12:24:57 +0200] rev 2945
Merging with main
Vita Stejskal <vstejskal@netbeans.org> [Wed, 15 Oct 2008 17:45:48 +0200] rev 2944
#120357: updating module dependencies and removing unneccessary use of the old formatting API; full IDE is buildable and runs somehow
Jesse Glick <jglick@netbeans.org> [Tue, 24 Aug 2010 10:03:37 -0400] rev 2943
Closing in preparation for merge to default.
Jesse Glick <jglick@netbeans.org> [Fri, 16 Jul 2010 14:21:50 -0400] rev 2942
Merged default into maven-dev.
Made no attempt to fix compilability or other semantic errors.
Conflict markers left for now in:
maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
maven.embedder/src/org/netbeans/modules/maven/embedder/EmbedderFactory.java
maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
maven.model/test/unit/src/org/netbeans/modules/maven/pom/ModelTest.java
maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
maven/src/org/netbeans/modules/maven/execute/MavenJavaExecutor.java
Jesse Glick <jglick@netbeans.org> [Fri, 16 Jul 2010 11:47:36 -0400] rev 2941
No longer want to treat this anonymous branch as part of the default branch.
Jesse Glick <jglick@netbeans.org> [Thu, 15 Jul 2010 12:14:32 -0400] rev 2940
ValidateLayerConsistencyTest.testNbinstHost failures.
Jesse Glick <jglick@netbeans.org> [Wed, 14 Jul 2010 09:24:33 -0400] rev 2939
Test deps.
Jesse Glick <jglick@netbeans.org> [Wed, 14 Jul 2010 09:24:26 -0400] rev 2938
Making compilable against new Servlet API.
Tomasz Slota <tslota@netbeans.org> [Tue, 13 Jul 2010 17:32:14 +0200] rev 2937
embedded JSP parser upgraded to the one from GlassFish V3 (Servlet API 2.5->3.0, JSP 2.1->2.2)