Jiri Rechtacek <jrechtacek@netbeans.org> [Thu, 20 Dec 2012 17:54:13 +0100] rev 250667
close 'fod_187678' branch before merging
Ondrej Vrabec <ovrabec@netbeans.org> [Thu, 20 Dec 2012 17:47:18 +0100] rev 250666
#224083 - [Git] NullPointerException at org.netbeans.modules.versioning.core.api.VCSFileProxy.createFileProxy
ensure git status and diff node return DataObject from lookup
ffjre@netbeans.org [Thu, 20 Dec 2012 06:21:49 -0800] rev 250665
Automated merge with main-silver
Jiri Rechtacek <jrechtacek@netbeans.org> [Wed, 19 Dec 2012 22:37:31 +0100] rev 250664
cont. #187678: "Deactivate plugin" is problematic when the plugin grouped by features.
Jiri Rechtacek <jrechtacek@netbeans.org> [Thu, 13 Dec 2012 22:38:17 +0100] rev 250663
JDK5
Jiri Rechtacek <jrechtacek@netbeans.org> [Thu, 13 Dec 2012 22:36:01 +0100] rev 250662
cont. #187678, EnableJ2EEEnablesJavaTest is passing
Jiri Rechtacek <jrechtacek@netbeans.org> [Thu, 13 Dec 2012 16:07:25 +0100] rev 250661
sync w/ trunk
Jiri Rechtacek <jrechtacek@netbeans.org> [Thu, 06 Dec 2012 19:10:52 +0100] rev 250660
re-start #187678, a feature can depend on other feature
ffjre@netbeans.org [Thu, 20 Dec 2012 19:08:36 +0000] rev 250659
Merge of http://hg.netbeans.org/web-main/
ffjre@netbeans.org [Thu, 20 Dec 2012 09:54:59 -0800] rev 250658
Automated merge with main-silver