debian/control |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 72ab75412b92504e0a87a3c6b12d905b77bce79c
Author: Robert Hooker <[email protected]>
Date:   Mon Mar 8 22:54:56 2010 -0500

    debian/control: More merge conflict fixes.

diff --git a/debian/control b/debian/control
index 95bc720..b01d886 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,10 @@ Priority: optional
 Maintainer: Ubuntu X-SWAT <[email protected]>
 XSBC-Original-Maintainer: Debian X Strike Force <[email protected]>
 Uploaders: David Nusinow <[email protected]>, Drew Parsons 
<[email protected]>, Brice Goglin <[email protected]>
-Standards-Version: 3.8.3
 Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7.3.15ubuntu3)
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
 Package: x11-common
 Architecture: all


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to