diff options
| author | Michael Abed <michaelabed@gmail.com> | 2012-04-10 00:15:59 -0400 |
|---|---|---|
| committer | Michael Abed <michaelabed@gmail.com> | 2012-04-10 00:15:59 -0400 |
| commit | de330174b48ee1ae0965dbbc39b7ea73b5f23e13 (patch) | |
| tree | 30086064de296555ee87a8d5e2453c1086b0b790 /franken.m | |
| parent | 0d307e49247b7ecd17e1f452b993544e6ec5e481 (diff) | |
| parent | 46f030abc79ac2c0f753e3a31c0b9a280b7f4060 (diff) | |
| download | ek301-prelim-de330174b48ee1ae0965dbbc39b7ea73b5f23e13.tar.gz ek301-prelim-de330174b48ee1ae0965dbbc39b7ea73b5f23e13.tar.bz2 ek301-prelim-de330174b48ee1ae0965dbbc39b7ea73b5f23e13.zip | |
merge github and local
Diffstat (limited to 'franken.m')
| -rwxr-xr-x | franken.m | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ % EK301, Section A1, Group 7, 4/09/12 % Michael Abed, ID U55178419 % Joseph Stone, ID U44434740 -% Ben Havey, ID +% Ben Havey, ID U46525972 % franken truss |