| commit | 5a8de4071bbe33eb7cfb2c3daee86c8674d36446 | |
| author | pier11 <pier11@operamail.com> | |
| Mon, 22 Feb 2010 17:35:48 +0000 (22 17:35 +0000) | ||
| committer | pier11 <pier11@operamail.com> | |
| Mon, 22 Feb 2010 17:35:48 +0000 (22 17:35 +0000) | ||
| tree | 710333df03b9922436a00d2679e52a86da6c0f4c | treesnapshot (tar.gz zip) |
| parent | f6b485f66681bc7e7e49ca32f0a3d73762a143dd | commitdiff |
| parent | b0dfea6e0b716188799a44706784a8c57d87c8c4 | commitdiff |
Merge branch 'mob' of git+ssh://localhost/srv/git/siplcs into mob
Conflicts:
src/core/sip-sec-ntlm.c
Conflicts:
src/core/sip-sec-ntlm.c
| src/core/sip-sec-ntlm.c | diff1 | diff2 | blobhistory |