summaryrefslogtreecommitdiff
path: root/docs/Makefile
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-05 08:58:22 -0700
committerLance Stout <lancestout@gmail.com>2012-10-05 08:58:22 -0700
commitfc07e23ff8f2eb7c67a1dfeae0db67b182144fca (patch)
tree3e4e276c988470cb178bf71722c9899fe08e2534 /docs/Makefile
parent84a2fc382b88133ce2398b1fac8c92196ddeb8dd (diff)
parent4ea328b9f2d56383c53e9707c97aa689010c837d (diff)
downloadslixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.tar.gz
slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.tar.bz2
slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.tar.xz
slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/Makefile')
0 files changed, 0 insertions, 0 deletions