| commit | 26e77306319f04b297fef1c213d0a9a1a4d56844 | |
| author | Torben Hohn <torbenh@gmx.de> | |
| Sat, 24 Jan 2009 19:12:55 +0000 (24 20:12 +0100) | ||
| committer | Torben Hohn <torbenh@gmx.de> | |
| Sat, 24 Jan 2009 19:12:55 +0000 (24 20:12 +0100) | ||
| tree | 2aba0c77e3e26e6052a3b599b175c28b64284d9a | treesnapshot (tar.gz zip) |
| parent | 37c9baef5decbc58fb6ca2a68be53c982a2fc165 | commitdiff |
| parent | f6c5a4a3443bd46cbcfd6ae8121660c69d55f86f | commitdiff |
Merge branch 'master' of http://repo.or.cz/r/calf
Conflicts:
src/calf/giface.h
Conflicts:
src/calf/giface.h