[Pkg-privacy-commits] [pidgin-otr] 102/255: Merge branch 'codereview'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 4f422c81f4e636d2585fdd1d1f7cca006c51b943
Merge: d811dc6 988f108
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date:   Thu Jun 7 09:40:23 2012 -0400

    Merge branch 'codereview'

 ChangeLog                        |   4 +
 Makefile.mingw                   |   2 +-
 NEWS                             |  28 ++++
 README                           |   2 +-
 configure.ac                     |   2 +-
 dialogs.h                        |   4 +-
 gtk-dialog.c                     | 334 ++++++++++---------------------------
 gtk-ui.c                         |  16 +-
 otr-plugin.c                     | 348 +++++++++++++++++----------------------
 otr-plugin.h                     |   9 +-
 packaging/windows/pidgin-otr.nsi |   3 +-
 11 files changed, 289 insertions(+), 463 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git