JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / st.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77f6cd6 288f80c)
Merge remote-tracking branch 'upstream/master'
authorJason Woofenden <jason@jasonwoof.com>
Sat, 28 Mar 2015 22:19:07 +0000 (18:19 -0400)
committerJason Woofenden <jason@jasonwoof.com>
Sat, 28 Mar 2015 22:19:07 +0000 (18:19 -0400)
Conflicts:
st.c
st.info

1  2 
config.mk patch | diff1 | diff2 | blob | history
st.c patch | diff1 | diff2 | blob | history

diff --cc config.mk
Simple merge
diff --cc st.c
Simple merge
st; my hacks to st (simple terminal) http://st.suckless.org/