mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-31 20:48:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix cvs conflict strings mistakenly included

Browse source 
Original commit message from CVS:
fix cvs conflict strings mistakenly included
This commit is contained in:
Christian Schaller 2004-12-01 17:58:05 +00:00
parent 6af3cb71c8
commit 2aed185cc1
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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 <mccann@jhu.edu>
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>

2
docs/upload.mak
View file

@ -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)