Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 10 Mar 2014 14:16:26 +0000 (15:16 +0100)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 10 Mar 2014 14:16:26 +0000 (15:16 +0100)
1  2 
st.c

diff --cc st.c
Simple merge