projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03618db b6dfd3c)
Merge branch 'master' of ssh://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Mon, 23 Jan 2012 05:29:18 +0000 (00:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 23 Jan 2012 05:29:18 +0000 (00:29 -0500)
1  2 
scripts/custom/examples/fred/uva_profile_additions.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/custom/examples/fred/uva_profile_additions.txt
index 6765749937f998e1e86224e1abb9b8fad523d1ac,98c61d243f79e34112cdc9aede776c8c9001113d..6765749937f998e1e86224e1abb9b8fad523d1ac
mode 100755,100644..100644
--- 1/scripts/custom/examples/fred/uva_profile_additions.txt
--- 2/scripts/custom/examples/fred/uva_profile_additions.txt
+++ b/scripts/custom/examples/fred/uva_profile_additions.txt