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 created
at 626e934d68713aca58f0470bab46d6e6395c4e56 (commit)
- Log -----------------------------------------------------------------
commit 626e934d68713aca58f0470bab46d6e6395c4e56
Merge: 74b0807 a61b73b
Author: Arnout Engelen <arn...@bz...>
Date: Thu Jun 14 00:55:22 2012 +0200
Merge commit 'a61b73b033b732f2e60dc5485748dfc38643e67c' into lgpl
Conflicts:
README
ion/Makefile
ioncore/ioncore.c
man/Makefile
man/notion.fi.in
mod_statusbar/ion-statusd/Makefile
system.mk
commit 74b08071ee85837d0d1f1b2bdbc09d894fab63f7
Merge: 4bd039c 951f7ac
Author: Arnout Engelen <arn...@bz...>
Date: Thu Jun 14 00:47:33 2012 +0200
Merge commit '951f7acb41e97cdadb0836a6d7bcc40962376d03' into lgpl
Conflicts:
RELNOTES
ioncore/frame-draw.c
commit 4bd039c1e9ee8402eae5e56404c5877a08d7ca70
Merge: 26ca407 d6dee0f
Author: Arnout Engelen <arn...@bz...>
Date: Thu Jun 14 00:25:06 2012 +0200
Merge commit 'd6dee0f6d590db68fba19a3ce4f96af32354e124' into lgpl
Skip all non-LGPL changes. Hopefully we can later merge dual-licensed commits
on master into this branch without too much trouble, so we can gradually
cleanly reimplement any stuff we miss from the non-LGPL era
-----------------------------------------------------------------------
hooks/post-receive
--
notion window manager core
|
