sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by George Sherwood (0da9646efe9f094fcf28ea4cec0a63d080fa5635)
- From: George Sherwood <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (0da9646efe9f094fcf28ea4cec0a63d080fa5635)
- Date: Sat, 3 Jan 2009 10:15:27 -0600
GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:
chat-libs/ptlib/CONFLICTS | 1 +
chat-libs/ptlib/HISTORY | 3 +++
chat-libs/pwlib/CONFLICTS | 1 +
chat-libs/pwlib/HISTORY | 3 +++
4 files changed, 8 insertions(+)
New commits:
commit 0da9646efe9f094fcf28ea4cec0a63d080fa5635
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
pwlib: Added conflicts ptlib. Bug 15002
commit f560460c370ef1b027aa1c54ff80e12d36dbc072
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
ptlib: Added conflicts pwlib. Bug 15002
diff --git a/chat-libs/ptlib/CONFLICTS b/chat-libs/ptlib/CONFLICTS
new file mode 100755
index 0000000..4dee3ad
--- /dev/null
+++ b/chat-libs/ptlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts pwlib
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index a1ca252..96fc350 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,6 @@
+2009-01-03 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFLICTS: Added conflicts pwlib. Bug 15002.
+
2008-11-39 George Sherwood <gsherwood AT sourcemage.org>
* BUILD: Added --disable-odbc to fix Bug #14924
diff --git a/chat-libs/pwlib/CONFLICTS b/chat-libs/pwlib/CONFLICTS
new file mode 100755
index 0000000..4366174
--- /dev/null
+++ b/chat-libs/pwlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts ptlib
diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY
index 476b836..49ce7cc 100644
--- a/chat-libs/pwlib/HISTORY
+++ b/chat-libs/pwlib/HISTORY
@@ -1,3 +1,6 @@
+2008-01-03 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFLICTS: Added conflicts ptlib. Bug #15002
+
2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: fix plugins/configure.in to not fail if alsa is disabled,
bug #14029
- [SM-Commit] GIT changes to master grimoire by George Sherwood (0da9646efe9f094fcf28ea4cec0a63d080fa5635), George Sherwood, 01/03/2009
Archive powered by MHonArc 2.6.24.