Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorChristoph Lohmann <20h@r-36.net>
Sun, 30 Aug 2015 09:29:23 +0000 (11:29 +0200)
committerChristoph Lohmann <20h@r-36.net>
Sun, 30 Aug 2015 09:29:23 +0000 (11:29 +0200)
1  2 
st.c

diff --cc st.c
Simple merge