summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-08-27 12:34:43 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-08-27 12:34:43 +0200
commitbdc62c036e569876c1fc7c4f15cf85dfc37d7ea9 (patch)
tree1cc3adb2a5fb76e2866d553f705c62492240f095 /README
parent0820827e15ee48f3ac36bc622d1dac07992f6af7 (diff)
parent8f8fc1a06999fef34ac9f1c6d645cfc94cbe8e6f (diff)
Merge branch 'master' into upstream-1.0
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions