| commit | 434d69dbc73ee9e408039092b43bfda123943c0e | |
| author | Stefan Becker <stefan.becker@nokia.com> | |
| Thu, 25 Feb 2010 21:56:23 +0000 (25 23:56 +0200) | ||
| committer | Stefan Becker <stefan.becker@nokia.com> | |
| Thu, 25 Feb 2010 21:56:23 +0000 (25 23:56 +0200) | ||
| tree | b6b607861d055dc9b4c12c34a9b6c4cfbea3eba2 | treesnapshot (tar.gz zip) |
| parent | b6130ee6d05b5bb9f16da0970235ccba0aab9669 | commitdiff |
| parent | c5d4f706d9ac79a5c6db0c6a3edfbb0033af876d | commitdiff |
Merge branch 'mob' of git+ssh://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 |