diff options
author | George Sherwood | 2009-01-03 10:15:38 -0600 |
---|---|---|
committer | Arwed von Merkatz | 2009-01-13 19:56:39 +0100 |
commit | 51510e5a5cbc10705f49ca3b69af8b34ba6f25bb (patch) | |
tree | 875f954de21a22bf6b855a7ce6339b17ef557232 | |
parent | fa4a68e7529898a922ce918da337b8418aa0633b (diff) |
pwlib: Added conflicts ptlib. Bug 15002
(cherry picked from commit 0da9646efe9f094fcf28ea4cec0a63d080fa5635)
-rwxr-xr-x | chat-libs/pwlib/CONFLICTS | 1 | ||||
-rw-r--r-- | chat-libs/pwlib/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chat-libs/pwlib/CONFLICTS b/chat-libs/pwlib/CONFLICTS new file mode 100755 index 0000000000..4366174fcd --- /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 476b836b11..49ce7cc638 100644 --- a/chat-libs/pwlib/HISTORY +++ b/chat-libs/pwlib/HISTORY @@ -1,3 +1,6 @@ +2008-01-03 George Sherwood <gsherwood@sourcemage.org> + * CONFLICTS: Added conflicts ptlib. Bug #15002 + 2007-10-03 Arwed v. Merkatz <v.merkatz@gmx.net> * PRE_BUILD: fix plugins/configure.in to not fail if alsa is disabled, bug #14029 |