vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 17:19:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.0'

Browse source 
Conflicts:
	build.gradle
This commit is contained in:
Florian Schmaus 2014-07-20 14:19:59 +02:00
commit d06d5b7c69
7 changed files with 77 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-experimental/src/main/java/org/jivesoftware/smack/initializer/experimental/ExperimentalInitializer.java
View file

@ -32,6 +32,6 @@ public class ExperimentalInitializer extends UrlInitializer {
@Override
protected String getConfigUrl() {
return "classpath:org.jivesoftware.smackx/extensions.xml";
return "classpath:org.jivesoftware.smackx/experimental.xml";
}
}

0
smack-experimental/src/main/resources/org.jivesoftware.smackx/extensions.xml → smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.xml
View file