| commit | dbc81f6d63914730d4d98a9a8b7be801ca10e6ec | |
| author | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Thu, 16 Jul 2009 16:51:51 +0000 (16 18:51 +0200) | ||
| committer | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Thu, 16 Jul 2009 16:51:51 +0000 (16 18:51 +0200) | ||
| tree | 5a360ca148b78efb7fcf6af02dd43a6ff3600898 | treesnapshot (tar.gz zip) |
| parent | 8c92c59e26cce1716928521dfa41257b0dd34c53 | commitdiff |
| parent | d1aa0f4490ab93195cbc171ef3275b06a3de4cfd | commitdiff |
Merge branch 'collin' into collin+newconf+sdl
Conflicts:
ChangeLog
Makefile.in
Conflicts:
ChangeLog
Makefile.in