lp:~unity-team/compiz-core/compiz-core.fix_bad_merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz-core/trunk at revision 2754

Sam Spilsbury: Approve on 2011-06-18

Diff: 14 lines (+2/-2)

1 file modified

src/window.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2754. By Sam Spilsbury on 2011-06-18

Fix typo which caused decorations to be updated recursively because
CompWindow::resize () would always send fake resize notify events to
core which would then cause CompWindow::resize () to be called again
with no geometry change etc etc

2753. By Sam Spilsbury on 2011-06-09

Fixes LP#795065

------------- This line and the following will be ignored --------------

modified:
  src/window.cpp
unknown:
  build/
  po/compiz.pot
pending merges:
  Sam Spilsbury 2011-05-25 Fix events going to frame windows when they sho...

2752. By Sam Spilsbury on 2011-06-09

Fixes LP#761616

------------ This line and the following will be ignored --------------

modified:
  src/screen.cpp
  src/window.cpp
unknown:
  build/
  po/compiz.pot
pending merges:
  Sam Spilsbury 2011-05-25 Restore selected event masks already rather tha...

2751. By Sam Spilsbury on 2011-06-09

Merge in lp:~unity-team/compiz-core/compiz-core.one_property_decor

2750. By Sam Spilsbury on 2011-06-09

Merge in ~unity-team/compiz-core/compiz-core.bits_and_pieces_2011_05_21

2749. By Sam Spilsbury on 2011-06-09

Merge in dock stacking fix

2748. By Sam Spilsbury on 2011-06-09

Merge in emacs fix

2747. By Sam Spilsbury on 2011-06-09

Merge in Scott's change from upstream

2746. By Sam Spilsbury on 2011-06-09

Merge in relevant branches

2745. By Sam Spilsbury on 2011-06-01

Merge in bell fix