summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-16 23:06:41 -0800
committerLance Stout <lancestout@gmail.com>2013-01-16 23:06:41 -0800
commit64ef6904320d6dd4dbdf4f9418a1dd054163899a (patch)
tree0c86039f5036313daece4d1f630f9d9b100d4b46 /examples
parent01da222d67858ac82951a0a3b01670ea201abd9c (diff)
parent41991b5982e6cfc9015eaf00663348ca6d4d3b2d (diff)
downloadslixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.gz
slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.bz2
slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.xz
slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.zip
Merge branch 'master' into develop
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions