projects
/
swc-workshop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bb7b5c
7bd5609
)
Merge branch 'master' into namespaced
author
W. Trevor King
<wking@tremily.us>
Thu, 13 Mar 2014 00:11:17 +0000
(17:11 -0700)
committer
W. Trevor King
<wking@tremily.us>
Thu, 13 Mar 2014 00:11:17 +0000
(17:11 -0700)
* master:
swc-windows-installer.sh: Use '~' in ~/nano.rc includes
swc-windows-installer.sh: Rename ~/.nanorc to ~/nano.rc
1
2
setup/windows-installer/swc-windows-installer.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
setup/windows-installer/swc-windows-installer.sh
Simple merge