| commit | bf0506d4029703a5135de42846ec5e068c5f4ba9 | |
| author | Stefan Becker <chemobejk@gmail.com> | |
| Tue, 30 Dec 2014 00:22:24 +0000 (30 02:22 +0200) | ||
| committer | Stefan Becker <chemobejk@gmail.com> | |
| Tue, 30 Dec 2014 00:22:24 +0000 (30 02:22 +0200) | ||
| tree | 2797b34ef83c91385b38f120f5fb67238c50208b | treesnapshot (tar.gz zip) |
| parent | d89ae4bcfa33280a9903ba6dcd848d464aeaebd4 | commitdiff |
| parent | 71dd2fc02edddbc02985d29e7b408a8b1f8e36c2 | commitdiff |
Merge tag '1.18.5' into mob
Release 1.18.5 -- Bug Fixes V
Conflicts:
ChangeLog
contrib/opensuse-build-service/pidgin-sipe.changes
contrib/opensuse-build-service/pidgin-sipe.spec
src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj
Release 1.18.5 -- Bug Fixes V
Conflicts:
ChangeLog
contrib/opensuse-build-service/pidgin-sipe.changes
contrib/opensuse-build-service/pidgin-sipe.spec
src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj
| ChangeLog | diff1 | diff2 | blobhistory |
| src/adium/xcconfigs/Base.xcconfig | diff1 | diff2 | blobhistory |