Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos 0.5
authorBdale Garbee <bdale@gag.com>
Wed, 19 Aug 2009 06:49:24 +0000 (00:49 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 19 Aug 2009 06:49:24 +0000 (00:49 -0600)
1  2 
src/Makefile

diff --cc src/Makefile
Simple merge