]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
commit2ea94420d31fd45a7c9cfa2301652f3ba1aef84a
tree585285a45230d1679cfd03cfc3fce417c6964d3e
parenta32d2d5d618db50e0277aef2dcbc850425a77c6b
parentd426f1570bd99315486c0b0634e04393aa65e6ed
Merge branch 'master' into next
src/scratchpad.c