Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx

Conflicts:
	fcitx.spec
This commit is contained in:
Fedora 2012-07-22 15:48:58 +08:00
commit b38c4bf0c9

View File

@ -310,6 +310,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%changelog
* Sun Jul 22 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.5-1
- Upstream to fcitx-4.2.5
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2
- Drop fcitx-keyboard