[vlc-devel] commit: Prevented QT4 gui from changing size while maximized. This should fix https://trac.videolan.org/vlc/ticket/1883 (Niklas Hayer )

[Rémi Denis-Courmont]

On Mon, 11 May 2009 01:53:22 +0200 (CEST), git at videolan.org (git version
control) wrote:
> vlc | branch: 1.0-bugfix | Niklas Hayer <nikha354 at gmail.com> | Sun May 10
> 20:44:09 2009 +0200| [109900f90d2a204dfa4e017cccb4875441c7f663] |
> committer: Jean-Baptiste Kempf
> 
> Prevented QT4 gui from changing size while maximized. This should fix
> https://trac.videolan.org/vlc/ticket/1883
> 
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> (cherry picked from commit e83df29b1f39dd46fe8893e5e111ed8be9a17e2d)

As long as 1.0 and master have hardly diverged at all, it is probably best
to MERGE 1.0-bugfix into master every so often:
- It keeps the commit database smaller, as commit hash are the same.
- It forces commit to 1.0-bugfix first, so we're less likely to backport
stuff without testing it.
- It makes latter git-merge and git-cherry faster, as both branches will
keep a longer common history.
- Fixes in 1.0 cannot be missing/lost in master/1.1.

Time will tell when this stops working.

-- 
Rémi Denis-Courmont