]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Oct 2012 13:08:31 +0000 (15:08 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Oct 2012 13:08:31 +0000 (15:08 +0200)
commit13147978c50b4efa5b4eb0b65d8175aa596a76fe
treecd537115b74157c063814688dfb095912eaeaa9b
parentf89bbe0746a75d6694fc7d305bef36171bac89f6
parent718d9229900886888eac441bb70ebc9f5b036958
Merge branch 'master' into next
src/workspace.c