summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-12-18 10:33:33 -0800
committerLance Stout <lancestout@gmail.com>2012-12-18 10:33:33 -0800
commit29c049612a181e480371f3a686170a87af1e9f98 (patch)
treedbb745d4f90296ccda720272b5b0c7f57252e147 /examples
parentf431bbfca2b9862f954e25d7dd234a9131bc2ee1 (diff)
parented481857326606603f70ef06dbd5a4b48d1b9510 (diff)
downloadslixmpp-29c049612a181e480371f3a686170a87af1e9f98.tar.gz
slixmpp-29c049612a181e480371f3a686170a87af1e9f98.tar.bz2
slixmpp-29c049612a181e480371f3a686170a87af1e9f98.tar.xz
slixmpp-29c049612a181e480371f3a686170a87af1e9f98.zip
Merge branch 'master' into develop
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions