ibus-chewing (1.3.5.20100706-1) debian-changes-1.3.5.20100706-1

Description: Upstream changes introduced in version 1.3.5.20100706-1
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 ibus-chewing (1.3.5.20100706-1) unstable; urgency=low
 .
   [ Asias He ]
   * New upstream release.
   * debian/control: bump standards version to 3.9.0
 .
 The person named in the Author field signed this changelog entry.
Author: LI Daobing <lidaobing@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- ibus-chewing-1.3.5.20100706.orig/ChangeLog
+++ ibus-chewing-1.3.5.20100706/ChangeLog
@@ -1,14 +1,23 @@
+<<<<<<< TREE
+<<<<<<< TREE
+<<<<<<< TREE
+* Tue May 04 2010 - Ding-Yi Chen <dchen at redhat.com> - 1.2.99.20100317
+=======
+=======
+=======
 * Wed Jul 07 2010 - Ding-Yi Chen <dchen at redhat.com> - 1.3.5.20100706
 - Fixed google issue 965:
   Candidate missing if both "Plain Zhuyin" and "Space As selection" are enabled.
 - Revised Basic.macro
 - Resolved: #608991
 
+>>>>>>> MERGE-SOURCE
 * Tue Jun 08 2010 - Ding-Yi Chen <dchen at redhat.com> - 1.3.4.20100608
 - ibus-chewing can now use mouse to click on mouse. Thus
   Fix Issue 951: Chewing does not support selection of candidates via mouseclick
   Thanks zork@chromium.org for the patch.
 
+>>>>>>> MERGE-SOURCE
 * Fri Jun 04 2010 - Ding-Yi Chen <dchen at redhat.com> - 1.3.4.20100605
 - Fix Issue 942: Fix unsunk references in ibus-chewing
   Applied the patch provided by zork@chromium.org.
@@ -18,6 +27,7 @@
   Bug 519108 is fixed from Fedora 11.
 
 * Wed Mar 17 2010 - Ding-Yi Chen <dchen at redhat.com> - 1.2.99.20100317
+>>>>>>> MERGE-SOURCE
 - Fix google 796: English input for dvorak
 - Fix google 797: Zhuyin input for dvorak
 - Fix google 807: ibus-chewing shows the over-the-spot panel
--- ibus-chewing-1.3.5.20100706.orig/SPECS/RPM-ChangeLog
+++ ibus-chewing-1.3.5.20100706/SPECS/RPM-ChangeLog
@@ -1,14 +1,23 @@
+<<<<<<< TREE
+<<<<<<< TREE
+<<<<<<< TREE
+* Tue May 04 2010 Ding-Yi Chen <dchen at redhat.com> - 1.2.99.20100317-1
+=======
+=======
+=======
 * Wed Jul 07 2010 Ding-Yi Chen <dchen at redhat.com> - 1.3.5.20100706-1
 - Fixed google issue 965:
   Candidate missing if both "Plain Zhuyin" and "Space As selection" are enabled.
 - Revised Basic.macro
 - Resolved: #608991
 
+>>>>>>> MERGE-SOURCE
 * Tue Jun 08 2010 Ding-Yi Chen <dchen at redhat.com> - 1.3.4.20100608-1
 - ibus-chewing can now use mouse to click on mouse. Thus
   Fix Issue 951: Chewing does not support selection of candidates via mouseclick
   Thanks zork@chromium.org for the patch.
 
+>>>>>>> MERGE-SOURCE
 * Fri Jun 04 2010 Ding-Yi Chen <dchen at redhat.com> - 1.3.4.20100605-1
 - Fix Issue 942: Fix unsunk references in ibus-chewing
   Applied the patch provided by zork@chromium.org.
@@ -21,6 +30,7 @@
 - Rebuild with ibus-1.3.0
 
 * Wed Mar 17 2010 Ding-Yi Chen <dchen at redhat.com> - 1.2.99.20100317-1
+>>>>>>> MERGE-SOURCE
 - Fix google 796: English input for dvorak
 - Fix google 797: Zhuyin input for dvorak
 - Fix google 807: ibus-chewing shows the over-the-spot panel