Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Tue, 14 Apr 2015 07:47:19 +0000 (09:47 +0200)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Tue, 14 Apr 2015 07:47:19 +0000 (09:47 +0200)
1  2 
st.c

diff --cc st.c
Simple merge