David Konecny <dkonecny@netbeans.org> [Mon, 03 Sep 2012 14:09:51 +1200] rev 239131
Closing branch to prepare for merge.
David Konecny <dkonecny@netbeans.org> [Mon, 03 Sep 2012 11:02:50 +1200] rev 239130
fetching latest changes from trunk before branch merge
mentlicher@netbeans.org [Fri, 31 Aug 2012 21:05:22 +0200] rev 239129
Automated merge with file:///home/martin/NETBEANS/SRC/HG_DEV2/web-main
mentlicher@netbeans.org [Fri, 31 Aug 2012 20:58:13 +0200] rev 239128
#217368: Tune the browser log output.
mentlicher@netbeans.org [Fri, 31 Aug 2012 19:42:51 +0200] rev 239127
#216903: Show complete URL for files that are not part of the project (remote files). File name only is displayed for local files. Tooltip shows always the complete path.
Jan Stola <jstola@netbeans.org> [Fri, 31 Aug 2012 17:12:14 +0200] rev 239126
Automated merge with http://hg.netbeans.org/web-main
Jan Stola <jstola@netbeans.org> [Fri, 31 Aug 2012 17:07:50 +0200] rev 239125
Marking overriden properties in Rule Editor.
Jan Stola <jstola@netbeans.org> [Fri, 31 Aug 2012 16:53:31 +0200] rev 239124
Ignore (in Property Summary) properties that are not parsed OK as they do not affect the selected element.
Jan Stola <jstola@netbeans.org> [Fri, 31 Aug 2012 16:52:09 +0200] rev 239123
Do not fire "selectedNodes" and "highlightedNodes" when the document is updated, i.e., allow html.navigator to solve issue 217533.
mentlicher@netbeans.org [Fri, 31 Aug 2012 16:31:10 +0200] rev 239122
Automated merge with file:///home/martin/NETBEANS/SRC/HG_DEV2/web-main