| commit | 5f911191e9681446103d7b69dfae77df24716037 | |
| author | pier11 <pier11@kinozal.tv> | |
| Wed, 6 May 2009 09:56:40 +0000 (6 10:56 +0100) | ||
| committer | pier11 <pier11@kinozal.tv> | |
| Wed, 6 May 2009 09:56:40 +0000 (6 10:56 +0100) | ||
| tree | 1d8b980e7ed7d9bf737ebc311426fbb65f7685d5 | treesnapshot (tar.gz zip) |
| parent | cdc755b86ae67b02bce572126e2caae52a8dfb78 | commitdiff |
| parent | 138b17a720a6b652ec19868cf7d831ed834bb5ec | commitdiff |
Merge branch 'mob' of git+ssh://mob@localhost/srv/git/siplcs into mob
Conflicts:
src/sipe.c
Conflicts:
src/sipe.c
| src/sipe.c | diff1 | diff2 | blobhistory |