[Notion-commits] notion window manager core branch lgpl updated. c4b456e1764e562b3ce703f6146d1e1d64928633

[Arnout E. <rab...@us...>]

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 "notion window manager core".

The branch, lgpl has been updated
       via  c4b456e1764e562b3ce703f6146d1e1d64928633 (commit)
       via  dbf0fd60cdd21222d2fa465882389f0c745f93db (commit)
       via  d15227aac21b11e31353198ca38d313d4d85caea (commit)
       via  25efdaabc2da86d85b6cb6388d1593fbed70a84a (commit)
       via  9f223c8518876a0fd5e92a17a6af49c42189dbf4 (commit)
       via  12fcefdbbdd9fa8a55fe9dd05e7f3a41e15e8999 (commit)
       via  bc39339ae35924b22ffd3f80ec806a2cef774eb9 (commit)
       via  a5d63573002f73562e366e1196ec0743361fbcf1 (commit)
       via  1b7bbfe9c066487fcead300f729d67798c997581 (commit)
       via  71b4a943f74a093140140e27672b432ddecb7b72 (commit)
       via  7f09147bb8689b745dfec7aaac33eb1655d44a0d (commit)
       via  4e896d7897131c1c10c8211d8dcf3cff3aa567d7 (commit)
       via  d8196fff51d4d2a14646239e211ff1cd788c9883 (commit)
       via  7e3df042741bb89eb26b2a0bcf4aa7a68436045e (commit)
       via  8440b68b419c24c50813a8e2a772695cc8649cc2 (commit)
       via  5e016e6ff330053899148365a39f3f8b8af17835 (commit)
       via  90058413a3105d4c884ea39bdeab1b68c005ba3e (commit)
       via  78b4f18e2382cd4ad6d1f1a297a24c2dd2d274c9 (commit)
       via  cbe6c808eace3978dea9c3a4d62d86821d0da1b1 (commit)
       via  519a5fdccf5ab27e55436d11098b8631fd3f1218 (commit)
       via  f9714ed590ed89023a6eeab8269370bc9f174899 (commit)
       via  050853ba8583450d2ebda55900cfb291a63f0f61 (commit)
       via  705b9b74fa721265cca886f5f0cd538f9c3318ae (commit)
       via  0a0f98b77772613b22ed002f9fcd294cd95a83bd (commit)
       via  4ac52abb186f52392ca4425bdfadf7dd0e1a039c (commit)
       via  52ed945cc66439b03f71cda2b6ec4b887bbb7596 (commit)
       via  243b1bea58a397803a569f32f59e5b8f71bfa311 (commit)
       via  b265d4eb37b9b15f2c9752804db416a56d95569f (commit)
       via  e8f83b67bdbdf180f623cd901a119014bd083bc4 (commit)
       via  c08b9380858ed7ef40ed92fc8186b0f01b21d9de (commit)
       via  8cabc6558530b6eaf126f0d57c92a719a7284b83 (commit)
       via  a60d78abc0cd272603517d8cc1a6f635e4f0a293 (commit)
      from  626e934d68713aca58f0470bab46d6e6395c4e56 (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 c4b456e1764e562b3ce703f6146d1e1d64928633
Merge: dbf0fd6 71b4a94
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 02:05:29 2012 +0200

    Merge commit '71b4a943f74a093140140e27672b432ddecb7b72' into lgpl
    
    Conflicts:
    	RELNOTES
    	ioncore/frame-draw.c

commit dbf0fd60cdd21222d2fa465882389f0c745f93db
Merge: d15227a 5e016e6
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 02:04:05 2012 +0200

    Merge commit '5e016e6ff330053899148365a39f3f8b8af17835' into lgpl
    
    Conflicts:
    	libmainloop/select.c

commit d15227aac21b11e31353198ca38d313d4d85caea
Merge: 25efdaa 9005841
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 02:02:38 2012 +0200

    Merge commit '90058413a3105d4c884ea39bdeab1b68c005ba3e' into lgpl
    
    Conflicts:
    	ioncore/netwm.c
    	libmainloop/select.c
    	version.h

commit 25efdaabc2da86d85b6cb6388d1593fbed70a84a
Merge: 9f223c8 4ac52ab
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 01:58:35 2012 +0200

    Merge commit '4ac52abb186f52392ca4425bdfadf7dd0e1a039c' into lgpl

commit 9f223c8518876a0fd5e92a17a6af49c42189dbf4
Merge: 12fcefd 52ed945
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 01:57:44 2012 +0200

    Merge commit '52ed945cc66439b03f71cda2b6ec4b887bbb7596' into lgpl
    
    The LGPL version did not have netwm_check_manage_user_time at all, so fixes
    to that method will have to be cleanroom-reimplemented too I guess.
    
    Conflicts:
    	ioncore/netwm.c

commit 12fcefdbbdd9fa8a55fe9dd05e7f3a41e15e8999
Merge: bc39339 243b1be
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 01:56:22 2012 +0200

    Merge commit '243b1bea58a397803a569f32f59e5b8f71bfa311' into lgpl
    
    Conflicts:
    	notion/Makefile

commit bc39339ae35924b22ffd3f80ec806a2cef774eb9
Merge: a5d6357 c08b938
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 01:52:46 2012 +0200

    Merge commit 'c08b9380858ed7ef40ed92fc8186b0f01b21d9de' into lgpl

commit a5d63573002f73562e366e1196ec0743361fbcf1
Merge: 1b7bbfe 8cabc65
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 01:52:30 2012 +0200

    Merge commit '8cabc6558530b6eaf126f0d57c92a719a7284b83' into lgpl
    
    Conflicts:
    	ioncore/frame-draw.c

commit 1b7bbfe9c066487fcead300f729d67798c997581
Merge: 626e934 a60d78a
Author: Arnout Engelen <arn...@bz...>
Date:   Sat Jun 16 01:51:23 2012 +0200

    Merge commit 'a60d78abc0cd272603517d8cc1a6f635e4f0a293' into lgpl
    
    Conflicts:
    	etc/cfg_notion.lua

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

Summary of changes:
 Makefile                                    |    2 +-
 README                                      |    2 +-
 RELNOTES                                    |    2 +-
 de/init.c                                   |    2 +-
 etc/Makefile                                |    2 +-
 etc/cfg_defaults.lua                        |    2 +-
 etc/{cfg_ion.lua => cfg_notion.lua}         |    6 +-
 etc/{cfg_ioncore.lua => cfg_notioncore.lua} |    2 +-
 ioncore/conf-bindings.c                     |    8 +-
 ioncore/conf.c                              |    2 +-
 ioncore/eventh.c                            |   19 ++++
 ioncore/frame-draw.c                        |  146 ++++++++++++++++-----------
 ioncore/frame.c                             |   54 ++--------
 ioncore/frame.h                             |    3 +-
 ioncore/ioncore_ext.lua                     |    3 +
 ioncore/modules.c                           |   27 ++++-
 ioncore/mplex.c                             |    9 ++
 ioncore/mplex.h                             |    1 +
 ioncore/netwm.c                             |   12 ++-
 ioncore/sizepolicy.c                        |    7 +-
 man/Makefile                                |    4 +-
 man/notion.cs.in                            |   10 +-
 man/notion.fi.in                            |    8 +-
 man/notion.in                               |   10 +-
 man/pwm3.cs.in                              |    2 +-
 man/pwm3.fi.in                              |    6 +-
 man/pwm3.in                                 |    2 +-
 man/welcome.cs.head                         |   12 +-
 man/welcome.fi.head                         |   20 ++--
 man/welcome.head                            |   16 ++--
 mod_dock/dock.c                             |    2 +-
 mod_menu/main.c                             |    2 +-
 mod_query/main.c                            |    2 +-
 mod_sm/sm.c                                 |    2 +-
 mod_sp/main.c                               |    2 +-
 mod_statusbar/main.c                        |    2 +-
 mod_tiling/main.c                           |    2 +-
 {ion => notion}/Makefile                    |    2 +-
 ion/ion.c => notion/notion.c                |    2 +-
 pwm/cfg_pwm.lua                             |    6 +-
 system.mk                                   |    2 +-
 utils/ion-completefile/ion-completefile.c   |    2 +
 version.h                                   |    8 +-
 43 files changed, 252 insertions(+), 185 deletions(-)
 rename etc/{cfg_ion.lua => cfg_notion.lua} (91%)
 rename etc/{cfg_ioncore.lua => cfg_notioncore.lua} (99%)
 rename {ion => notion}/Makefile (98%)
 rename ion/ion.c => notion/notion.c (99%)


hooks/post-receive
-- 
notion window manager core