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

Conflicts:
	fcitx.spec
This commit is contained in:
Liang Suilong 2013-02-02 14:45:13 +08:00
commit 53dbefa81c
1 changed files with 4 additions and 1 deletions

View File

@ -5,7 +5,7 @@
Name: fcitx
Summary: Free Chinese Input Toy for X (XIM)
Version: 4.2.7
Release: 2%{?dist}
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
URL: http://code.google.com/p/%{name}/
@ -318,6 +318,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
* Fri Feb 01 2013 Liang Suilong <liangsuilong@gmail.com> - 4.2.7-1
- Upstream to fcitx-4.2.7
* Sat Jan 26 2013 Kevin Fenzi <kevin@scrye.com> 4.2.6.1-3
- Rebuild for new icu
* Mon Nov 26 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.6.1-2
- Disable xdg-autostart