| commit | 69c3e782c80dee787ed32cdfd5239bca3c511d32 | |
| author | pier11 <pier11@kinozal.tv> | |
| Tue, 14 Jul 2009 16:41:34 +0000 (14 17:41 +0100) | ||
| committer | pier11 <pier11@kinozal.tv> | |
| Tue, 14 Jul 2009 16:41:34 +0000 (14 17:41 +0100) | ||
| tree | 56cac08f88c5efa0ad4045c46e2bc0330448df93 | treesnapshot (tar.gz zip) |
| parent | 728fc8244ee4e73458491a72eb9fafa2ec82ba03 | commitdiff |
| parent | d6b86184b8dab959de76eb964f4ecc2c76583dae | commitdiff |
Merge branch 'mob' of git+ssh://mob@localhost/srv/git/siplcs into mob
Conflicts:
src/sipe-conf.c
Conflicts:
src/sipe-conf.c
| src/sipe-conf.c | diff1 | diff2 | blobhistory |