summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-18 15:51:44 -0400
committerLance Stout <lancestout@gmail.com>2011-03-18 15:51:44 -0400
commitf2c99798a6cf0dafe10fd547b036ecbb7a32569b (patch)
tree8a5d8192e3e0ed06cdb124a15daad5039a62e479 /examples
parentd5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (diff)
parent996ca52471931ccb3ac5a0f661e52fdc400db64b (diff)
downloadslixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.gz
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.bz2
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.xz
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions