]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 23 Jul 2014 07:48:26 +0000 (09:48 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 23 Jul 2014 07:48:26 +0000 (09:48 +0200)
commit67e00b3ab8a325143df90703317a3155c6ae9f5f
tree0afa2c2ae7c459d9d2621522a5d1d3e6d5d8ff63
parent8e8afb2609845a808fcc2d72eb93fb44dd570c7e
parenta62bb17511949dbc6880763360dd2a530ec70866
Merge branch 'master' into next
src/x.c