review.tizen.org Git - platform/upstream/ibus-libpinyin.git/commit

projects / platform / upstream / ibus-libpinyin.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 163587a f9a90e8)

author	Peng Huang <shawn.p.huang@gmail.com>
	Sun, 23 May 2010 04:48:45 +0000 (12:48 +0800)
committer	Peng Huang <shawn.p.huang@gmail.com>
	Sun, 23 May 2010 04:48:45 +0000 (12:48 +0800)
commit	b4e80d22b99d42afdc5067738129910877160704
tree	4699d76e7050f89a60553437e166e727ef6576dd	tree \| snapshot
parent	163587a5185b137df364194d862a671019e3528c	commit \| diff
parent	f9a90e87c0de01909659b5c134bd8d0fc5fd14b1	commit \| diff

Merge remote branch 'byvoid/PhoneticEditor' into config

Conflicts:
src/BopomofoEditor.cc
src/Editor.h
src/PinyinEditor.cc

src/BopomofoEditor.cc	diff1 \|	diff2 \|	blob \| history
src/BopomofoEditor.h	diff1 \|	diff2 \|	blob \| history
src/BopomofoEngine.cc	diff1 \|	diff2 \|	blob \| history
src/DoublePinyinEditor.cc	diff1 \|	diff2 \|	blob \| history
src/Editor.h	diff1 \|	diff2 \|	blob \| history
src/PhoneticEditor.cc	\|	diff2 \|	blob \| history
src/PhoneticEditor.h	\|	diff2 \|	blob \| history
src/PinyinEditor.cc	diff1 \|	diff2 \|	blob \| history
src/PinyinEditor.h	diff1 \|	diff2 \|	blob \| history
src/PinyinEngine.cc	diff1 \|	diff2 \|	blob \| history
src/PunctEditor.cc	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Text Input;