| commit | 90d6d73500ab951e1e43b0c838b3d069c65db40f | |
| author | Kai Lautaportti <kai@lautaportti.fi> | |
| Thu, 24 Jan 2008 23:34:58 +0000 (25 01:34 +0200) | ||
| committer | Kai Lautaportti <kai@lautaportti.fi> | |
| Thu, 24 Jan 2008 23:34:58 +0000 (25 01:34 +0200) | ||
| tree | e6547618ab2578104a321404d6cf9c119c35d323 | treesnapshot (tar.gz zip) |
| parent | e9d00cba44f4b976f88b3cb48da52595d80d7c93 | commitdiff |
| parent | 56e4264f1ad746e12a5fa1586b1d9e18b5b434c1 | commitdiff |
Merge branch 'master' of ssh://repo.or.cz/srv/git/gibberis.ch
Conflicts:
src/Bullschit/src/bullschit/user_templates/slideshow.pt
Fixed.
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
src/Bullschit/src/bullschit/user_templates/slideshow.pt
Fixed.
nothing added to commit but untracked files present (use "git add" to track)