Commit graph

3 commits

Author SHA1 Message Date
zodiac
37d32ee749 Fixed typo
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@148 0da03de8-d603-11dd-86c2-0f8696b7b6f9
2009-07-09 07:51:10 +00:00
zodiac
13263e1737 Make 'update' warn about merge conflicts
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@147 0da03de8-d603-11dd-86c2-0f8696b7b6f9
2009-07-08 20:11:40 +00:00
zodiac
d51ada4a87 Added an 'update' script that should make it easier for people to track SVN
even if they have mismatching versions of the autotools


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@146 0da03de8-d603-11dd-86c2-0f8696b7b6f9
2009-07-08 19:16:53 +00:00