jmillman 28b1f6e53a Merge branch 'source_level_1.8' into advanced_timeline
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2014-08-26 16:16:17 -04:00
..
2014-08-26 15:33:51 -04:00
2014-08-26 15:33:51 -04:00