From e443776eb7025c569df22f801965f0ec84798e35 Mon Sep 17 00:00:00 2001 From: jack Date: Sun, 2 May 2004 21:58:08 +0000 Subject: merge trunk to branches and corrected confliction git-svn-id: http://opensvn.csie.org/pttbbs/branches/Jaky.i18n@1919 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- util/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/Makefile') diff --git a/util/Makefile b/util/Makefile index 0f6e38af..bc6dbf1b 100644 --- a/util/Makefile +++ b/util/Makefile @@ -27,7 +27,7 @@ CPROG_WITH_UTIL= \ # 下面這些程式, 會直接被 compile CPROG_WITHOUT_UTIL= \ - shmsweep uhash_loader showboard antispam \ + shmsweep uhash_loader showboard \ countalldice webgrep bbsrf initbbs \ userlist tunepasswd buildir merge_passwd \ merge_board xchatd bbsmail -- cgit v1.2.3