unity-2d

Merge lp:~unity-2d-team/unity-2d/shell-rogue-declaration into lp:~unity-2d-team/unity-2d/unity-2d-shell

  1. shell-rogue-declaration
  2. Merge into unity-2d-shell
Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 953
Merge reported by: Albert Astals Cid
Merged at revision: not available
Proposed branch: lp:~unity-2d-team/unity-2d/shell-rogue-declaration
Merge into: lp:~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 11 lines (+0/-1)
1 file modified
shell/app/shelldeclarativeview.h (+0/-1)
To merge this branch: bzr merge lp:~unity-2d-team/unity-2d/shell-rogue-declaration
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+91455@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Kill it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/app/shelldeclarativeview.h'
2--- shell/app/shelldeclarativeview.h 2012-01-27 11:28:12 +0000
3+++ shell/app/shelldeclarativeview.h 2012-02-03 16:29:19 +0000
4@@ -114,7 +114,6 @@
5 private:
6 void focusOutEvent(QFocusEvent* event);
7 void focusInEvent(QFocusEvent* event);
8- void updateMask();
9 void setWMFlags();
10 bool isSpreadActive();
11 void updateInputShape();

Subscribers

People subscribed via source and target branches

to all changes: