| commit | 626902443952eeb72b99cd07ca387bba33d374a0 | |
| author | pier11 <pier11@operamail.com> | |
| Sun, 21 Feb 2010 10:36:25 +0000 (21 10:36 +0000) | ||
| committer | pier11 <pier11@operamail.com> | |
| Sun, 21 Feb 2010 10:36:25 +0000 (21 10:36 +0000) | ||
| tree | c1db59416472d85d4b81443d0ca37a7c765526bd | treesnapshot (tar.gz zip) |
| parent | 08d3c3fbb2bad154094946ca8ffd592971f2bd67 | commitdiff |
| parent | 8e59d637f4dcc5c45291d1a794564795761dd216 | commitdiff |
Merge branch 'mob' of git+ssh://mob@repo.or.cz/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 |
| src/core/tests.c | diff1 | diff2 | blobhistory |