]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 20:43:31 +0000 (22:43 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 20:43:31 +0000 (22:43 +0200)
commit37a40671c9b9317a621a5f82fd3780dae8a121a4
tree941ea7f2f019715afd2bec6a6825cba9b726ca5e
parent62e9eab4e5efb490d1abcb15678e7efab4b8e16c
parent3690bc6eefdd52d18989840ab1bc1730a0696e81
Merge branch 'master' into next
src/floating.c