From fe226db77a55fb3a7ad791a55da3f32dc9847639 Mon Sep 17 00:00:00 2001
From: Tobias Nygren <tnn@NetBSD.org>
Date: Wed, 2 Dec 2009 15:17:50 +0000
Subject: [PATCH] add firefox fix merge botch in previous

---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e52cbfd662..9e21aa286b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,4 @@
-<<<<<<< Makefile
-# $Id: Makefile,v 1.3711 2009/12/02 13:52:34 fhajny Exp $
-=======
-# $Id: Makefile,v 1.3711 2009/12/02 13:52:34 fhajny Exp $
->>>>>>> 1.3706
+# $Id: Makefile,v 1.3712 2009/12/02 15:17:50 tnn2 Exp $
 #
 
 COMMENT=	WIP pkgsrc packages
@@ -417,6 +413,7 @@ SUBDIR+=	filelight
 SUBDIR+=	filepp
 SUBDIR+=	firebird
 SUBDIR+=	fireflysung-ttf
+SUBDIR+=	firefox
 SUBDIR+=	firefox-wrapper
 SUBDIR+=	firehose
 SUBDIR+=	fish
@@ -2359,6 +2356,7 @@ SUBDIR+=	xspread
 SUBDIR+=	xtags
 SUBDIR+=	xtrace
 SUBDIR+=	xtrlock
+SUBDIR+=	xulrunner
 SUBDIR+=	xvmware
 SUBDIR+=	xwelltris
 SUBDIR+=	xxdiff