| commit | 8bdcfe6316c7426c285c1a727c7674bd1b912fe4 | |
| author | Stefan Becker <stefan.becker@nokia.com> | |
| Fri, 16 Jul 2010 10:24:14 +0000 (16 13:24 +0300) | ||
| committer | Stefan Becker <stefan.becker@nokia.com> | |
| Fri, 16 Jul 2010 10:24:14 +0000 (16 13:24 +0300) | ||
| tree | 20936ab7ee73e817a6a97e067877d7a144207fb3 | treesnapshot (tar.gz zip) |
| parent | a6dfdbf0bc028d1df7b58d00cbf9853f7cf4a880 | commitdiff |
| parent | 953ac2edb7c619a1789e5527bb0e4ec457ad93d6 | commitdiff |
Merge commit '1.10.1' into mob
Conflicts:
ChangeLog
VERSION
contrib/rpm/pidgin-sipe.spec
src/core/sipe.c
Conflicts:
ChangeLog
VERSION
contrib/rpm/pidgin-sipe.spec
src/core/sipe.c
| ChangeLog | diff1 | diff2 | blobhistory |
| contrib/rpm/pidgin-sipe.spec | diff1 | diff2 | blobhistory |