Petr Hejl <phejl@netbeans.org> [Tue, 16 Aug 2016 16:02:35 +0200] rev 310993
Closing branch to prepare for merge.
Petr Hejl <phejl@netbeans.org> [Tue, 16 Aug 2016 15:23:00 +0200] rev 310992
synched w/ trunk
Petr Hejl <phejl@netbeans.org> [Tue, 16 Aug 2016 15:03:39 +0200] rev 310991
#267316 - JSX template is not formatted correctly
Petr Hejl <phejl@netbeans.org> [Fri, 12 Aug 2016 11:30:47 +0200] rev 310990
#267316 - JSX template is not formatted correctly
ffjre@netbeans.org [Tue, 16 Aug 2016 16:46:44 +0000] rev 310989
Merge of http://hg.netbeans.org/cnd-main/
Alexander Simon <alexvsimon@netbeans.org> [Tue, 16 Aug 2016 15:54:07 +0300] rev 310988
fixed Bug #267600 IDE uses 2 path separators ':' and ';'
ffjre@netbeans.org [Tue, 16 Aug 2016 12:40:39 +0000] rev 310987
Automated merge with main-silver
ffjre@netbeans.org [Tue, 16 Aug 2016 15:35:44 +0000] rev 310986
Merge of http://hg.netbeans.org/web-main/
Petr Pisl <ppisl@netbeans.org> [Tue, 16 Aug 2016 14:55:27 +0200] rev 310985
#267593 - NullPointerException at org.netbeans.modules.css.visual.CssCaretAwareSourceTask.run
Petr Pisl <ppisl@netbeans.org> [Tue, 16 Aug 2016 14:51:26 +0200] rev 310984
Automated merge with http://hg.netbeans.org/web-main