[SCM] kwin packaging branch, master, updated. 5998484523c3d88fe9b85502279d76c293a95d21

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=f829666

The following commit has been merged in the master branch:
commit f829666c48ddba487ab73c64fe087528b37296ce
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 8 19:12:23 2015 +0100

    Minor aesthetic change
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 063c1af..ad9c7f0 100644
--- a/debian/control
+++ b/debian/control
@@ -67,8 +67,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kwin.git
 Package: kwin-dev
 Section: devel
 Architecture: any
-Conflicts: kde-workspace-dev
 Depends: kwin (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kde-workspace-dev
 Description: KDE window manager - devel files
  KWin (pronounced as one syllable "kwin") is the window
  manager for the KDE Plasma Desktop. It gives you complete

-- 
kwin packaging