| commit | da25bb1cdf7f82e5c554873f047b4df2fc9f699c | |
| author | pier11 <pier11@kinozal.tv> | |
| Tue, 12 May 2009 20:05:21 +0000 (12 21:05 +0100) | ||
| committer | pier11 <pier11@kinozal.tv> | |
| Tue, 12 May 2009 20:05:21 +0000 (12 21:05 +0100) | ||
| tree | 5b2d71559cb41474da4df160719abdd61bef8a7a | treesnapshot (tar.gz zip) |
| parent | c1bb27b04298b79cf83fb9a9edc996ca3d68e877 | commitdiff |
| parent | 78c1638a6cfb696686377f52e0c1b6ebf9443987 | commitdiff |
Merge branch 'mob' of git+ssh://mob@repo.or.cz/srv/git/siplcs into mob
Conflicts:
src/sipe.c
Conflicts:
src/sipe.c
| src/sipe.c | diff1 | diff2 | blobhistory |