diff options
| author | George Sherwood | 2009-01-03 10:15:15 -0600 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-01-13 19:56:45 +0100 |
| commit | 868c75eef28522cc11bf2c383eee73e8aa7c932b (patch) | |
| tree | 920aa9c239abbe83acd591864d56701108a1d20f | |
| parent | 51510e5a5cbc10705f49ca3b69af8b34ba6f25bb (diff) | |
ptlib: Added conflicts pwlib. Bug 15002
(cherry picked from commit f560460c370ef1b027aa1c54ff80e12d36dbc072)
| -rwxr-xr-x | chat-libs/ptlib/CONFLICTS | 1 | ||||
| -rw-r--r-- | chat-libs/ptlib/HISTORY | 3 |
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 |