Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 13 Apr 2015 20:01:40 +0000 (22:01 +0200)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 13 Apr 2015 20:01:40 +0000 (22:01 +0200)
1  2 
st.c

diff --cc st.c
Simple merge