summaryrefslogtreecommitdiff
path: root/libpurple/protocols/msn/history.c
diff options
context:
space:
mode:
authorRichard Laager <rlaager@pidgin.im>2007-09-16 17:59:57 +0000
committerRichard Laager <rlaager@pidgin.im>2007-09-16 17:59:57 +0000
commit988b8f0aa47bf43aec717c737cf9e599dc4489f0 (patch)
tree5f0db08c57704d274882c12f1ba99708eae0f3ab /libpurple/protocols/msn/history.c
parent09a8dc4e408d921589518e4a6c6de0f12141159d (diff)
parent240b1717ad131b4068f52e29f3dcc2cc21d5d0c6 (diff)
downloadpidgin-988b8f0aa47bf43aec717c737cf9e599dc4489f0.tar.gz
explicit merge of 'fd6596d6433199e76ffc0d44e9641ed1da25e942'
and 'a4a7b830471aa5520ab9dfd119ac84c694cc0f86'
Diffstat (limited to 'libpurple/protocols/msn/history.c')
-rw-r--r--libpurple/protocols/msn/history.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libpurple/protocols/msn/history.c b/libpurple/protocols/msn/history.c
index 27e35d85f8..3c45a6d10e 100644
--- a/libpurple/protocols/msn/history.c
+++ b/libpurple/protocols/msn/history.c
@@ -84,3 +84,4 @@ msn_history_add(MsnHistory *history, MsnTransaction *trans)
msn_transaction_destroy(trans);
}
}
+