Author: flo Date: Sat Aug 24 17:01:03 2013 New Revision: 1335 Log: Update conflicts
Modified: trunk/www/firefox/Makefile Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Fri Aug 23 18:46:05 2013 (r1334) +++ trunk/www/firefox/Makefile Sat Aug 24 17:01:03 2013 (r1335) @@ -23,7 +23,7 @@ USE_PYTHON_BUILD=-2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko -CONFLICTS= firefox-24.* firefox-1[07].* +CONFLICTS= firefox-24.* firefox-1[07].* firefox-esr-17.* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= # empty MOZILLA_NAME= Firefox _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
