]> git.sur5r.net Git - i3/i3/commit
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Aug 2009 13:13:27 +0000 (15:13 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Aug 2009 13:13:27 +0000 (15:13 +0200)
commitec0113f631e9603b26486af506ca6797d2e732b4
treecc12f610e014ad6da5437111881e4f336101f6a7
parentcdfbcbb28063e05cb57d69d2cf85b3fcf8050dee
parent74a6c7532db8ac3ef5dcdfe6df97a3101e895e82
Merge branch 'next'

Conflicts:
src/manage.c
src/util.c
src/xinerama.c
src/config.c
website/downloads/index.html