| commit | dd26944b641e03bd4cf92576b6fa302abfcec2c1 | |
| author | pier11 <pier11@operamail.com> | |
| Thu, 15 Apr 2010 13:18:21 +0000 (15 14:18 +0100) | ||
| committer | pier11 <pier11@operamail.com> | |
| Thu, 15 Apr 2010 13:18:21 +0000 (15 14:18 +0100) | ||
| tree | 57b80ad5dd7d944bfb42375a014e4dce88d94014 | treesnapshot (tar.gz zip) |
| parent | 9f9464c2e65ecd6c44620ee23603df1f05c46db8 | commitdiff |
| parent | c943ddd14cc5f490f4ef4a24028d3a303710b935 | commitdiff |
Merge branch 'mob' of git+ssh://localhost/srv/git/siplcs into mob
Conflicts:
src/core/sipe-domino.c
Conflicts:
src/core/sipe-domino.c
| src/core/sipe-domino.c | diff1 | diff2 | blobhistory |