summaryrefslogtreecommitdiffstats
path: root/chat-im/gaim1.5/HISTORY
diff options
context:
space:
mode:
Diffstat (limited to 'chat-im/gaim1.5/HISTORY')
-rw-r--r--chat-im/gaim1.5/HISTORY3
1 files changed, 3 insertions, 0 deletions
diff --git a/chat-im/gaim1.5/HISTORY b/chat-im/gaim1.5/HISTORY
index b09b1e6c80..25c5fd2089 100644
--- a/chat-im/gaim1.5/HISTORY
+++ b/chat-im/gaim1.5/HISTORY
@@ -1,3 +1,6 @@
+2008-08-24 George Sherwood <gsherwood@sourcemage.org>
+ * CONFLICTS: conflicts carrier
+
2007-05-20 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: renamed evolution2 to evolution