From 2aed185cc1edd5e7e4b0217c4c2ee9ce926d27f8 Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Wed, 1 Dec 2004 17:58:05 +0000 Subject: [PATCH] fix cvs conflict strings mistakenly included Original commit message from CVS: fix cvs conflict strings mistakenly included --- ChangeLog | 4 ++++ docs/upload.mak | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 24321c9a8b..0d4df6d522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-01 Christian Fredrik Kalager Schaller christian@fluendo.com + + * docs/upload.mak: fix included CVS conflict strings + 2004-12-01 William Jon McCann Reviewed by: Ronald S. Bultje diff --git a/docs/upload.mak b/docs/upload.mak index ed01e5e951..6bf1e6ec1a 100644 --- a/docs/upload.mak +++ b/docs/upload.mak @@ -13,6 +13,8 @@ # correct User entry for the Host entry for the DOC_SERVER # these variables define the location of the online docs +DOC_SERVER=uraeus@freedesktop.org +DOC_BASE=/home/projects/gstreamer/www/data/doc DOC_SERVER=freedesktop.org DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc DOC_URL=$(DOC_SERVER):$(DOC_BASE)