Branch: refs/heads/1.4.y
  Home:   https://github.com/ibus/ibus
  Commit: 7e6517c95ebe6c58b58f68925163e96f133ad6bf
      
https://github.com/ibus/ibus/commit/7e6517c95ebe6c58b58f68925163e96f133ad6bf
  Author: fujiwarat <[email protected]>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M configure.ac
    M dconf/Makefile.am
    A dconf/config-private.h
    M dconf/config.c
    R dconf/config.h
    M dconf/main.c

  Log Message:
  -----------
  Support dconf 0.13.4

TEST=Manually

Review URL: https://codereview.appspot.com/6426044

Conflicts:
        conf/dconf/config-private.h
        conf/dconf/config.h
        dconf/config.h


  Commit: a37c3fabe546242a985421f941d0b1cff505ae2a
      
https://github.com/ibus/ibus/commit/a37c3fabe546242a985421f941d0b1cff505ae2a
  Author: Peng Huang <[email protected]>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M configure.ac
    M dconf/Makefile.am
    A dconf/config-private.h
    M dconf/config.c
    R dconf/config.h
    M dconf/main.c

  Log Message:
  -----------
  Merge pull request #7 from microcai/1.4.y

back port 1.5.y "Support dconf 0.13.4" to 1.4.y, please provide new ibus-1.4.3 
tarball :)


Compare: https://github.com/ibus/ibus/compare/61f15bd7b056...a37c3fabe546

-- 
-- 
You received this message because you are subscribed to the Google
Groups "ibus-devel" group.
iBus project web page: http://code.google.com/p/ibus/
iBus dev group: http://groups.google.com/group/ibus-devel?hl=en
--- 
You received this message because you are subscribed to the Google Groups 
"ibus-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


回复