[PD-cvs] [git]Pd-extended branch, master, updated. 1709375ac82e61b919f0ee4516d0e47d17a0cbe4

[Hans-Christoph Steiner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Pd-extended".

The branch, master has been updated
       via  1709375ac82e61b919f0ee4516d0e47d17a0cbe4 (commit)
       via  7fb826f54c6967f81aad8b4816243ad1f7453a94 (commit)
       via  59dbf4107819ab83030758e184f992cf1c74830a (commit)
       via  b19e3ba8f7e733ac278da7e5fd2469c290bb9493 (commit)
       via  10bf2a2ffb80112f7c4e8ef6b291c07c691b5c80 (commit)
       via  6597a85c5f38d73a43d21d588136972cfcdab4ed (commit)
       via  fb01496175c57fa4f9aedd5337ba720b2d952a0d (commit)
       via  627e249cbc7dfa516e3def346622d3d06b8c36bc (commit)
       via  a98068735cbb14916723b139ef7af0b99d82b1a5 (commit)
       via  0dbef72bf810681a24dd100d34384ae55419d7f5 (commit)
       via  d610ef78f12c9bf91bfeaaebf56d4176ae84d1bf (commit)
       via  80348aeaeca34508612072f5f0a3d4ed1b9c9e08 (commit)
       via  e0af10035eecd4c8ab17c16e7585420313aac598 (commit)
      from  999ad65342f8557b1de892f73b2657f3c2ba8532 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1709375ac82e61b919f0ee4516d0e47d17a0cbe4
Merge: 999ad65342f8557b1de892f73b2657f3c2ba8532 7fb826f54c6967f81aad8b4816243ad1f7453a94
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Jun 6 22:54:00 2011 -0400

    Merge branch 'patch_series'
    
    Conflicts:
    	src/g_canvas.c
    	src/g_magicglass.c
    	src/g_magicglass.h
    	src/s_main.c
    	tcl/pd-gui.tcl
    	tcl/pd_menucommands.tcl
    	tcl/pd_menus.tcl
    	tcl/pdtk_canvas.tcl

-----------------------------------------------------------------------

Summary of changes:
 src/g_canvas.c          |   28 ++--------------------------
 src/g_magicglass.c      |   33 ++++++---------------------------
 src/g_magicglass.h      |   32 ++++++++++++++++++++++++++++++--
 src/g_text.c            |    4 ++--
 src/m_glob.c            |    8 ++++++++
 src/s_main.c            |    8 ++++----
 tcl/pd-gui.tcl          |    9 +++++++++
 tcl/pd_bindings.tcl     |    9 +++++----
 tcl/pd_menucommands.tcl |   14 +++++++++++++-
 tcl/pd_menus.tcl        |   12 +++++++++++-
 tcl/pdtk_canvas.tcl     |   20 +++++++++++++++++++-
 11 files changed, 109 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
Pd-extended