Wed, 28 Dec 2011 14:41:26 +0100Merging with trunk groovy_parser
Martin Janicek <mjanicek@netbeans.org> [Wed, 28 Dec 2011 14:41:26 +0100] rev 215988
Merging with trunk

Wed, 28 Dec 2011 14:40:26 +0100#206679 - NullPointerException at org.netbeans.modules.maven.j2ee.utils.MavenProjectSupport.obtainServerIds groovy_parser
Martin Janicek <mjanicek@netbeans.org> [Wed, 28 Dec 2011 14:40:26 +0100] rev 215987
#206679 - NullPointerException at org.netbeans.modules.maven.j2ee.utils.MavenProjectSupport.obtainServerIds

Fri, 23 Dec 2011 12:50:45 +0100Creating groovy parser branch groovy_parser
Martin Janicek <mjanicek@netbeans.org> [Fri, 23 Dec 2011 12:50:45 +0100] rev 215986
Creating groovy parser branch

Wed, 28 Dec 2011 12:33:26 +0000Automated merge with main-silver
ffjre@netbeans.org [Wed, 28 Dec 2011 12:33:26 +0000] rev 215985
Automated merge with main-silver

Wed, 28 Dec 2011 17:36:29 +0100Merge of http://hg.netbeans.org/main/
ffjre@netbeans.org [Wed, 28 Dec 2011 17:36:29 +0100] rev 215984
Merge of http://hg.netbeans.org/main/

Wed, 28 Dec 2011 16:43:31 +0100Issue #206466 - missing ellipses in pop-up sub-menus
Stepan Zebra <stezeb@netbeans.org> [Wed, 28 Dec 2011 16:43:31 +0100] rev 215983
Issue #206466 - missing ellipses in pop-up sub-menus

Wed, 28 Dec 2011 17:04:40 +0100Merge of http://hg.netbeans.org/jet-main/
ffjre@netbeans.org [Wed, 28 Dec 2011 17:04:40 +0100] rev 215982
Merge of http://hg.netbeans.org/jet-main/

Wed, 28 Dec 2011 15:39:21 +0100#205002 - "Could not lock document" from LexerBasedHighlightLayer.setColorings
Miloslav Metelka <mmetelka@netbeans.org> [Wed, 28 Dec 2011 15:39:21 +0100] rev 215981
#205002 - "Could not lock document" from LexerBasedHighlightLayer.setColorings

Wed, 28 Dec 2011 16:34:28 +0100Merge of http://hg.netbeans.org/core-main/
ffjre@netbeans.org [Wed, 28 Dec 2011 16:34:28 +0100] rev 215980
Merge of http://hg.netbeans.org/core-main/

Wed, 28 Dec 2011 14:09:05 +0100#206620 - NullPointerException at org.netbeans.modules.subversion.client.PropertiesClient.getProperties
Ondrej Vrabec <ovrabec@netbeans.org> [Wed, 28 Dec 2011 14:09:05 +0100] rev 215979
#206620 - NullPointerException at org.netbeans.modules.subversion.client.PropertiesClient.getProperties
property value can be evidently empty