Vince Kraemer <vkraemer@netbeans.org> [Thu, 09 Jun 2011 14:40:52 -0700] rev 200640
#195117 : move fix to fixes release70_fixes
ffjre@netbeans.org [Fri, 10 Jun 2011 00:02:55 +0200] rev 200639
Automated merge with main-silver
ffjre@netbeans.org [Thu, 09 Jun 2011 23:02:21 +0200] rev 200638
Merge of http://hg.netbeans.org/cnd-main/
Vladimir Voskresensky <vv159170@netbeans.org> [Thu, 09 Jun 2011 23:11:49 +0400] rev 200637
change spec version in trunk
Alexander Simon <alexvsimon@netbeans.org> [Thu, 09 Jun 2011 23:13:26 +0400] rev 200636
fixing Bug #199230 Add "Resolve Conflict" if project doesn't have needed artifacts for working correctly
- implemented resolve dialog
ffjre@netbeans.org [Thu, 09 Jun 2011 20:01:29 +0200] rev 200635
Automated merge with main-silver
ffjre@netbeans.org [Thu, 09 Jun 2011 19:03:01 +0200] rev 200634
Merge of http://hg.netbeans.org/cnd-main/
Nikolay Krasilnikov <nnnnnk@netbeans.org> [Thu, 09 Jun 2011 17:46:33 +0400] rev 200633
added CsmErrorProvider param to CsmErrorProvider.RequestValidator.isValid
(transplanted from 47b17346fbb049776593e5fc62e3e626bd8cf141)
Nikolay Krasilnikov <nnnnnk@netbeans.org> [Thu, 09 Jun 2011 17:44:26 +0400] rev 200632
fixed CsmErrorProvider.RequestValidator.isValid
(transplanted from b3eb8da4fb86c584eb68be303e2ae5df1e44b54c)
Nikolay Krasilnikov <nnnnnk@netbeans.org> [Thu, 09 Jun 2011 17:43:55 +0400] rev 200631
added @RandomlyFails to MetaprogrammingTestCase
(transplanted from b0360d158a4689ca500c92cb9f5958ff9aa9aad8)