This is an automated email from the git hooks/post-receive script. abe pushed a commit to branch master in repository libwx-perl.
commit c165c626f59dcd203038af46d15763a24ee680a3 Merge: 8ac0ce0 bb14c2e Author: Axel Beckert <a...@deuxchevaux.org> Date: Sat May 30 18:53:28 2015 +0200 Merge tag 'upstream/0.9927' Upstream version 0.9927 Conflicts: Changes META.json META.yml Window.xs Wx.pm XS/ComboBox.xs lib/Wx/Mini.pm typemap (All conflicts were just version numbers, RCS-IDs, etc. And a removed mailing list listing.) Changes | 19 ++++++++++++ Constant.xs | 55 ++++++++++++++++++++-------------- META.json | 8 +++-- META.yml | 30 ++++++++++--------- Makefile.PL | 4 +-- Window.xs | 9 +++++- Wx.pm | 4 +-- XS/ComboBox.xs | 33 ++++++++++++++++++-- XS/DC.xsp | 9 +++++- XS/Menu.xs | 5 ++-- XS/Timer.xs | 12 ++++++-- build/Wx/build/MakeMaker/MacOSX_GCC.pm | 29 ++++++++++++++++-- build/Wx/build/Options.pm | 1 - cpp/app.h | 2 +- cpp/wxapi.h | 14 ++++++++- ext/aui/AUI.xs | 22 ++++++++++++-- ext/dnd/lib/Wx/DND.pm | 4 +-- ext/grid/XS/GridCellEditor.xs | 2 +- ext/grid/cpp/editor.h | 2 +- ext/grid/cpp/gr_constants.cpp | 16 ++++++++-- ext/richtext/Makefile.PL | 4 +-- ext/stc/cpp/st_constants.cpp | 2 +- ext/xrc/cpp/xr_constants.cpp | 2 +- lib/Wx/Mini.pm | 2 +- typemap | 3 +- typemap.tmpl | 3 +- 26 files changed, 224 insertions(+), 72 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libwx-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits