Merged newstairs branch
authorelviz <elviz@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Fri, 15 Oct 2010 20:47:40 +0000 (20:47 +0000)
committerelviz <elviz@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Fri, 15 Oct 2010 20:47:40 +0000 (20:47 +0000)
commit797973a3211801b769a33d7d503dbd04439ffdc8
treea9fb72573a18168811e271bd7507034f3a2c1283
parent991c169058bd29f40f91075697011a715f7cfdd7
parentee4c617248a820d7e208bdf16c11f82a12e10119
Merged newstairs branch

git-svn-id: https://s.snth.net/svn/neverball/trunk@3314 78b8d119-cf0a-0410-b17c-f493084dd1d7