[Pkg-voip-commits] r5712 - /mumble/trunk/debian/control

[the-me-guest at alioth.debian.org]

Author: the-me-guest
Date: Mon May 12 16:12:52 2008
New Revision: 5712

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5712
Log:
Doh! There still was something from an subversion conflict.

Modified:
    mumble/trunk/debian/control

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=5712&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Mon May 12 16:12:52 2008
@@ -4,11 +4,8 @@
 Homepage: http://mumble.sourceforge.net/
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Patrick Matthäi <patrick.matthaei at web.de>
-<<<<<<< .mine
 Build-Depends: debhelper (>= 5.0.51~), po-debconf, libspeechd-dev, libaudio-dev, libasound2-dev, libboost-dev, libfontconfig1-dev, libglu1-mesa-dev, libgl1-mesa-dev, libqt4-dev, libqt4-opengl-dev, libpng12-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxrender-dev, libxrandr-dev, libxi-dev, libxevie-dev
-=======
 Build-Depends: debhelper (>= 5.0.51~), po-debconf, libspeechd-dev, libasound2-dev, libboost-dev, libglu1-mesa-dev, libgl1-mesa-dev, libqt4-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libxext-dev
->>>>>>> .r5710
 Standards-Version: 3.7.3
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble/trunk/