summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-12 22:36:23 -0700
committerLance Stout <lancestout@gmail.com>2012-08-12 22:36:23 -0700
commit5c25208fb53e5fd08be032ce96307302d18ab27b (patch)
treebef66ea1a9de8f252cb5605868e9b73df85c2f36 /examples
parent962dfad2166574955c7be6d12c930991b0f29403 (diff)
parent779c258e2797d3dbcaf9eb5f4c7636b4d76ff0e7 (diff)
downloadslixmpp-5c25208fb53e5fd08be032ce96307302d18ab27b.tar.gz
slixmpp-5c25208fb53e5fd08be032ce96307302d18ab27b.tar.bz2
slixmpp-5c25208fb53e5fd08be032ce96307302d18ab27b.tar.xz
slixmpp-5c25208fb53e5fd08be032ce96307302d18ab27b.zip
Merge branch 'master' into develop
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions