summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-31 12:34:17 -0500
committerLance Stout <lancestout@gmail.com>2011-12-31 12:34:17 -0500
commitfa912aeb84a95d1cf72639587488aa64cf556aa7 (patch)
tree68f088d0a0e5164064ac9589eee35ee9468d45f2 /examples
parent9a5e2ae7686a2dad72f2aea2592ab002111003da (diff)
parent4a12e1059a8cc38a3baf30a18dd6143e7d5beebb (diff)
downloadslixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.tar.gz
slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.tar.bz2
slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.tar.xz
slixmpp-fa912aeb84a95d1cf72639587488aa64cf556aa7.zip
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions