Mercurial > pidgin

changeset 16095:80adc614a9e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '68afd9ff77d030e589ee7972830cf2a91916240f' and '9aef6467b816a8a5e600be2bfb75f15eb10f7d4a'
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 14 Apr 2007 02:19:49 +0000
parents 2d9045592ed3 (current diff) a4644c26cd85 (diff)
children 770e2f91d8f1 634b96915d2e
files
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sat Apr 14 01:23:12 2007 +0000
+++ b/COPYRIGHT	Sat Apr 14 02:19:49 2007 +0000
@@ -198,6 +198,7 @@
 Syd Logan
 Lokheed
 Norberto Lopes
+Shlomi Loubaton
 Uli Luckas
 Matthew Luckie
 Mike Lundy
--- a/libpurple/plugins/mono/api/Makefile.am	Sat Apr 14 01:23:12 2007 +0000
+++ b/libpurple/plugins/mono/api/Makefile.am	Sat Apr 14 02:19:49 2007 +0000
@@ -1,4 +1,4 @@
-monodir=$(libdir)/purple
+monodir=$(libdir)/libpurple
 
 mono_sources = \
 	BlistNode.cs \
--- a/libpurple/plugins/mono/loader/Makefile.am	Sat Apr 14 01:23:12 2007 +0000
+++ b/libpurple/plugins/mono/loader/Makefile.am	Sat Apr 14 02:19:49 2007 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/purple
+plugindir = $(libdir)/libpurple
 
 plugin_LTLIBRARIES = mono.la