Xinqi Bao's Git

projects / st.git / diff
summary | log | commit | diff | tree
raw | combined (merge: 0d838b7 7e61f5e)
Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorChristoph Lohmann <[email protected]>
Sun, 30 Aug 2015 09:29:23 +0000 (11:29 +0200)
committerChristoph Lohmann <[email protected]>
Sun, 30 Aug 2015 09:29:23 +0000 (11:29 +0200)
st.c diff1 | diff2 | blob | history

diff --cc st.c
Simple merge