Fri, 03 Feb 2012 21:47:17 +0100Merging two heads on marshall-mime-resolvers-191777 marshall-mime-resolvers-191777
Jaroslav Tulach <jtulach@netbeans.org> [Fri, 03 Feb 2012 21:47:17 +0100] rev 218915
Merging two heads on marshall-mime-resolvers-191777

Fri, 03 Feb 2012 21:42:16 +0100Making sure .instance resolvers work in unit tests marshall-mime-resolvers-191777
Jaroslav Tulach <jtulach@netbeans.org> [Fri, 03 Feb 2012 21:42:16 +0100] rev 218914
Making sure .instance resolvers work in unit tests

Fri, 03 Feb 2012 18:28:15 +0000Automated merge with main-silver
ffjre@netbeans.org [Fri, 03 Feb 2012 18:28:15 +0000] rev 218913
Automated merge with main-silver

Fri, 03 Feb 2012 17:17:28 +0100#208044: Don't print warning when generating mime resolver by annotation processor
Jaroslav Tulach <jtulach@netbeans.org> [Fri, 03 Feb 2012 17:17:28 +0100] rev 218912
#208044: Don't print warning when generating mime resolver by annotation processor

Sun, 05 Feb 2012 02:15:10 +0100Merge of http://hg.netbeans.org/web-main/
ffjre@netbeans.org [Sun, 05 Feb 2012 02:15:10 +0100] rev 218911
Merge of http://hg.netbeans.org/web-main/

Sat, 04 Feb 2012 19:33:13 +0000Automated merge with main-silver
ffjre@netbeans.org [Sat, 04 Feb 2012 19:33:13 +0000] rev 218910
Automated merge with main-silver

Sat, 04 Feb 2012 12:33:14 +0000Automated merge with main-silver
ffjre@netbeans.org [Sat, 04 Feb 2012 12:33:14 +0000] rev 218909
Automated merge with main-silver

Fri, 03 Feb 2012 18:34:13 +0000Automated merge with main-silver
ffjre@netbeans.org [Fri, 03 Feb 2012 18:34:13 +0000] rev 218908
Automated merge with main-silver

Fri, 03 Feb 2012 21:34:27 +0400Automated merge with http://hg.netbeans.org/web-main
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 03 Feb 2012 21:34:27 +0400] rev 218907
Automated merge with http://hg.netbeans.org/web-main

Fri, 03 Feb 2012 21:20:15 +0400#199037 fix for columns
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 03 Feb 2012 21:20:15 +0400] rev 218906
#199037 fix for columns