commit 50f367e7d7033c5b124069c7c38d1c7712c886ce Merge: 09256cf 1cd1af2 Author: Daiki Ueno ueno@unixuser.org Date: Tue Jul 5 16:55:09 2011 +0900
Merge branch 'master' of ssh://pkgs.fedoraproject.org/ibus-hangul
Conflicts: ibus-hangul-xx-icon-symbol.patch
ibus-hangul-xx-icon-symbol.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---