]> git.lizzy.rs Git - micro.git/commitdiff
projects / micro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7184b92 9328d42)
Merge branch 'cross-compile'
authorZachary Yedidia <zyedidia@gmail.com>
Tue, 22 Mar 2016 22:31:50 +0000 (18:31 -0400)
committerZachary Yedidia <zyedidia@gmail.com>
Tue, 22 Mar 2016 22:31:50 +0000 (18:31 -0400)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
A modern and intuitive terminal-based text editor