aboutsummaryrefslogtreecommitdiffstats
path: root/m2/jitsi-protocol
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
commit85901329b0794b136b96bf745f4ab1572806fc89 (patch)
treef23da7e97cae727f39d825f0fef8348cffb238e4 /m2/jitsi-protocol
parent3db2e44f186c59429901b2c899e139ea60117a55 (diff)
parentcf5da997da8820b4050f5b87ee9440a0ede36d1f (diff)
downloadjitsi-master.zip
jitsi-master.tar.gz
jitsi-master.tar.bz2
Merge commit 'cf5da99'HEADmaster
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'm2/jitsi-protocol')
-rw-r--r--m2/jitsi-protocol/pom.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/m2/jitsi-protocol/pom.xml b/m2/jitsi-protocol/pom.xml
index e045b56..d97e083 100644
--- a/m2/jitsi-protocol/pom.xml
+++ b/m2/jitsi-protocol/pom.xml
@@ -61,11 +61,9 @@
</excludes>
<includes>
<include>net/java/sip/communicator/service/protocol/**</include>
- <include>resources/images/protocol/facebook/**</include>
<include>resources/images/protocol/googletalk/**</include>
<include>resources/images/protocol/icq/**</include>
<include>resources/images/protocol/jabber/**</include>
- <include>resources/images/protocol/yahoo/**</include>
</includes>
</configuration>
</plugin>
@@ -77,11 +75,9 @@
<exclude>resources/images/protocol/media/**</exclude>
</excludes>
<includes>
- <include>resources/images/protocol/facebook/**</include>
<include>resources/images/protocol/googletalk/**</include>
<include>resources/images/protocol/icq/**</include>
<include>resources/images/protocol/jabber/**</include>
- <include>resources/images/protocol/yahoo/**</include>
</includes>
</resource>
</resources>