diff options
| author | ghen <ghen@pkgsrc.org> | 2006-11-22 12:48:29 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2006-11-22 12:48:29 +0000 |
| commit | c1dc9371809f946a5d8e0ab6aa12f3aa4c437475 (patch) | |
| tree | 1474408175f74859a5e88e8a66409c649a266855 /www/seamonkey/Makefile | |
| parent | 3a1dd77b82b3b580a394514c3695af031e60d843 (diff) | |
| download | pkgsrc-c1dc9371809f946a5d8e0ab6aa12f3aa4c437475.tar.gz | |
Resolve conflicts. I should have cvs add'ed this instead of cvs import'ing, as
wip/seamonkey has already existed in pkgsrc-wip.
Diffstat (limited to 'www/seamonkey/Makefile')
| -rw-r--r-- | www/seamonkey/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 7732797f433..51b502b12c3 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/11/08 14:39:16 ghen Exp $ +# $NetBSD: Makefile,v 1.14 2006/11/22 12:48:29 ghen Exp $ MOZILLA= seamonkey @@ -7,5 +7,5 @@ COMMENT= Full featured gecko-based browser MOZILLA_USE_GTK2= # yes MOZILLA_USE_XFT= YES -.include "../../www/seamonkey/Makefile-seamonkey.common" +.include "../../wip/seamonkey/Makefile-seamonkey.common" .include "../../mk/bsd.pkg.mk" |