summaryrefslogtreecommitdiffstats
path: root/chat-libs/ptlib
diff options
context:
space:
mode:
authorGeorge Sherwood2009-01-03 10:15:15 -0600
committerGeorge Sherwood2009-01-03 10:15:15 -0600
commitf560460c370ef1b027aa1c54ff80e12d36dbc072 (patch)
tree5ba4e03e1634c53fd7d2278599d46d20f4166743 /chat-libs/ptlib
parent78c7320a41025d2459dcc578b83839391e9a8588 (diff)
ptlib: Added conflicts pwlib. Bug 15002
Diffstat (limited to 'chat-libs/ptlib')
-rwxr-xr-xchat-libs/ptlib/CONFLICTS1
-rw-r--r--chat-libs/ptlib/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/chat-libs/ptlib/CONFLICTS b/chat-libs/ptlib/CONFLICTS
new file mode 100755
index 0000000000..4dee3ad9bc
--- /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 a1ca252b35..96fc350b24 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,6 @@
+2009-01-03 George Sherwood <gsherwood@sourcemage.org>
+ * CONFLICTS: Added conflicts pwlib. Bug 15002.
+
2008-11-39 George Sherwood <gsherwood@sourcemage.org>
* BUILD: Added --disable-odbc to fix Bug #14924