[SCM] VLC media player packaging branch, sid, updated. debian/1.1.0-4-8-g70106ea

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit f76ebea5f731084f5fe3fbe8eae1b1db8764ee8e
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Tue Jul 20 23:35:57 2010 +0200

    Add comment about merging in README.source

diff --git a/debian/README.source b/debian/README.source
index ace1951..a08e843 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -13,3 +13,11 @@ Permanent patches
 Temporary patches
 4??-*.diff: Bugs fix most likely taken from upstream Git
 CVE-*-*.diff: Security fix
+
+
+This package uses Git-Buildpackage as a VCS to manage the packaging.
+You might experience troubles when merging the upstream branch in the sid or experimental branches.
+Try merging with -s recursive -X theirs
+Or use git checkout --theirs upstream/x.y.z -- <paths>  to sort the mess.
+
+

-- 
VLC media player packaging