[X2go-Commits] nxcomp.git - master (branch) updated: 3.5.0-1-10-g21b952e

[X2go dev team]

The branch, master has been updated
       via  21b952ee3180adade9549b24ffda78f3ae291d5a (commit)
      from  b31ce74a5b8b1ec3859b3cd65a22ffe869e2e13f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21b952ee3180adade9549b24ffda78f3ae291d5a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 14 11:08:50 2011 +0200

    x11proto-nx-dev conflicts with with x11proto-video-dev

-----------------------------------------------------------------------

Summary of changes:
 debian/control |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/control b/debian/control
index 98403eb..cf9f0c4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Conflicts:
  x11proto-randr-dev,
  x11proto-record-dev,
  x11proto-xinerama-dev,
+ x11proto-video-dev,
  xbitmaps
 Standards-Version: 3.9.2
 Homepage: http://code.x2go.org/releases/source/nxcomp
@@ -68,6 +69,7 @@ Conflicts:
  x11proto-randr-dev,
  x11proto-record-dev,
  x11proto-xinerama-dev,
+ x11proto-video-dev,
  xbitmaps
 Replaces:
  x11proto-core-dev,
@@ -75,6 +77,7 @@ Replaces:
  x11proto-randr-dev,
  x11proto-record-dev,
  x11proto-xinerama-dev,
+ x11proto-video-dev,
  xbitmaps
 Description: NX X11 replacement library-headers
  NX provides a differential X compression library for X11.


hooks/post-receive
-- 
nxcomp.git (NX comp library)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nxcomp.git" (NX comp library).