[SM-Commit] GIT changes to master =?unknown-8bit?Q?xor?= =?unknown-8bit?Q?g-modular_grimoire_by_Andra=C5?= =?unknown-8bit?Q?=BE?= Levstik (59a33177d58ad0f4ba5bed9164143d372a81a569)

=?unknown-8bit?Q?Andra=C5=BE?= Levstik scm at mail.sourcemage.org
Sun Aug 27 14:58:49 EDT 2006


GIT changes to master xorg-modular grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 xorg-libs/libxcomposite/CONFLICTS |    1 +
 xorg-libs/libxcomposite/HISTORY   |    3 +++
 xorg-libs/libxcursor/CONFLICTS    |    1 +
 xorg-libs/libxcursor/HISTORY      |    1 +
 xorg-libs/libxdamage/CONFLICTS    |    1 +
 xorg-libs/libxdamage/HISTORY      |    3 +++
 xorg-libs/libxevie/CONFLICTS      |    1 +
 xorg-libs/libxevie/HISTORY        |    3 +++
 xorg-libs/libxfixes/CONFLICTS     |    1 +
 xorg-libs/libxfixes/HISTORY       |    3 +++
 xorg-libs/libxft/CONFLICTS        |    1 +
 xorg-libs/libxft/HISTORY          |    1 +
 xorg-libs/libxrender/CONFLICTS    |    1 +
 xorg-libs/libxrender/HISTORY      |    3 +++
 14 files changed, 24 insertions(+)

New commits:
commit 59a33177d58ad0f4ba5bed9164143d372a81a569
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxrender: fixes for bug #12623

commit 8aaabfe9f826e9c899b1b48effcb98369da5d762
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxft: fixes for bug #12623

commit 8ba9d76a86dcd6e3942c573ff51a925ed9b078b0
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxfixes: fixes for bug #12623

commit 3f1da63fe0df3e5aed4e90819eea978ab0b119bb
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxevie: fixes for bug #12623

commit b002e765266a5e5a054a25b62ff53077b60aa87a
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxdamage: fixes for bug #12623

commit df4b378948361304c17552493a3465e83a1aaae9
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxcursor: fixes for bug #12623

commit 8d945ea2c2f24dabe15ac024553dbfdd5b9847ef
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    libxcomposite: fixes for bug #12623

diff --git a/xorg-libs/libxcomposite/CONFLICTS b/xorg-libs/libxcomposite/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxcomposite/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxcomposite/HISTORY b/xorg-libs/libxcomposite/HISTORY
index f2e7aca..3f1b88d 100644
--- a/xorg-libs/libxcomposite/HISTORY
+++ b/xorg-libs/libxcomposite/HISTORY
@@ -1,3 +1,6 @@
+2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* CONFLICTS: added per bug #12623
+
 2006-05-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx> 
 	* DETAILS: version update xorg 7.1
 
diff --git a/xorg-libs/libxcursor/CONFLICTS b/xorg-libs/libxcursor/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxcursor/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxcursor/HISTORY b/xorg-libs/libxcursor/HISTORY
index 58f8a9c..8ac4d95 100644
--- a/xorg-libs/libxcursor/HISTORY
+++ b/xorg-libs/libxcursor/HISTORY
@@ -1,5 +1,6 @@
 2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: update to 1.1.7
+	* CONFLICTS: added per bug #12623
 
 2006-05-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx> 
 	* DETAILS: version update xorg 7.1
diff --git a/xorg-libs/libxdamage/CONFLICTS b/xorg-libs/libxdamage/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxdamage/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxdamage/HISTORY b/xorg-libs/libxdamage/HISTORY
index e706a33..02dd74b 100644
--- a/xorg-libs/libxdamage/HISTORY
+++ b/xorg-libs/libxdamage/HISTORY
@@ -1,3 +1,6 @@
+2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* CONFLICTS: added per bug #12623
+
 2006-05-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx> 
 	* PROVIDES: provides XDAMAGE
 
diff --git a/xorg-libs/libxevie/CONFLICTS b/xorg-libs/libxevie/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxevie/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxevie/HISTORY b/xorg-libs/libxevie/HISTORY
index 37df5b4..0abca20 100644
--- a/xorg-libs/libxevie/HISTORY
+++ b/xorg-libs/libxevie/HISTORY
@@ -1,3 +1,6 @@
+2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* CONFLICTS: added per bug #12623
+
 2006-05-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx> 
 	* DETAILS: version update xorg 7.1
 
diff --git a/xorg-libs/libxfixes/CONFLICTS b/xorg-libs/libxfixes/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxfixes/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxfixes/HISTORY b/xorg-libs/libxfixes/HISTORY
index 9067e30..9fdd9e9 100644
--- a/xorg-libs/libxfixes/HISTORY
+++ b/xorg-libs/libxfixes/HISTORY
@@ -1,3 +1,6 @@
+2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* CONFLICTS: added per bug #12623
+
 2006-05-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx> 
 	* DETAILS: version update xorg 7.1
 
diff --git a/xorg-libs/libxft/CONFLICTS b/xorg-libs/libxft/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxft/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxft/HISTORY b/xorg-libs/libxft/HISTORY
index e91d3e3..f3de828 100644
--- a/xorg-libs/libxft/HISTORY
+++ b/xorg-libs/libxft/HISTORY
@@ -1,5 +1,6 @@
 2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: version 2.1.10
+	* CONFLICTS: added per bug #12623
 
 2005-12-26 Robin Cook <rcook at wyrms.net>
 	* DETAILS: Updated VERSION to 2.1.8.2
diff --git a/xorg-libs/libxrender/CONFLICTS b/xorg-libs/libxrender/CONFLICTS
new file mode 100755
index 0000000..92d28c2
--- /dev/null
+++ b/xorg-libs/libxrender/CONFLICTS
@@ -0,0 +1 @@
+conflicts xorg
diff --git a/xorg-libs/libxrender/HISTORY b/xorg-libs/libxrender/HISTORY
index f73808d..f0384b9 100644
--- a/xorg-libs/libxrender/HISTORY
+++ b/xorg-libs/libxrender/HISTORY
@@ -1,3 +1,6 @@
+2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* CONFLICTS: adde as per bug #12623
+
 2006-05-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx> 
 	* DETAILS: version update xorg 7.1
 



More information about the SM-Commit mailing list