Florian Smeets 79986fba5b The previous commit fixed one mismerge and introduced another. Put a needed ... check for i386 on 9.x back in. Pointhat to: flo		2013-11-01 23:16:27 +00:00
..
files	- update firefox to 25.0	2013-10-30 20:37:55 +00:00
distinfo	- update firefox to 25.0	2013-10-30 20:37:55 +00:00
Makefile	The previous commit fixed one mismerge and introduced another. Put a needed	2013-11-01 23:16:27 +00:00
Makefile.options	- update firefox to 25.0	2013-10-30 20:37:55 +00:00
Makefile.webplugins	- update www/firefox to 18.0	2013-01-10 22:29:23 +00:00
pkg-descr
pkg-message	- update thunderbird, firefox-esr, linux-thunderbird and linux-firefox to	2013-04-03 20:27:48 +00:00