aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSebastien Vincent <seb@jitsi.org>2011-03-25 12:12:59 +0000
committerSebastien Vincent <seb@jitsi.org>2011-03-25 12:12:59 +0000
commitf66ae33f62343a2782d3f417939847b4b99a97f0 (patch)
treec3ef06b4852f9eaa64d349641b74a95daa934ebe /lib
parent3c582f11022c051bcbada5d6a4dd0550bc276323 (diff)
downloadjitsi-f66ae33f62343a2782d3f417939847b4b99a97f0.zip
jitsi-f66ae33f62343a2782d3f417939847b4b99a97f0.tar.gz
jitsi-f66ae33f62343a2782d3f417939847b4b99a97f0.tar.bz2
Fix NPE in Google Contacts service. Redesign Jabber account contact source activation: do all in Google Contacts service. Fix name in Mac OS X Dock when Jitsi is run from the sources.
Diffstat (limited to 'lib')
-rw-r--r--lib/felix.client.run.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 286f500..f1cc0c5 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -60,11 +60,11 @@ felix.auto.start.45= \
reference:file:sc-bundles/branding.jar \
reference:file:sc-bundles/provdisc-dhcp.jar \
reference:file:sc-bundles/provdisc-mdns.jar \
+ reference:file:sc-bundles/googlecontacts.jar \
reference:file:sc-bundles/certificate.jar
felix.auto.start.49= \
reference:file:sc-bundles/provisioning.jar \
- reference:file:sc-bundles/googlecontacts.jar \
reference:file:sc-bundles/bouncycastle.jar \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/protocol.jar \