From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 21 Jan 2012 14:22:29 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~127
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc27c19761b47fa449514395f7ea2a21654f515d;p=i3%2Fi3

Merge branch 'master' into next

Conflicts:
	testcases/t/005-floating.t
---

fc27c19761b47fa449514395f7ea2a21654f515d
diff --cc testcases/t/005-floating.t
index 9ac45627,688de40a..db5fb6db
--- a/testcases/t/005-floating.t
+++ b/testcases/t/005-floating.t
@@@ -18,7 -36,13 +18,7 @@@ ok($absolute->{x} != 0 && $absolute->{y
  
  $window->unmap;
  
- $window = open_floating_window(rect => [ 1, 1, 80, 90 ]);
 -$window = $x->root->create_child(
 -    class => WINDOW_CLASS_INPUT_OUTPUT,
 -    rect => [ 20, 20, 80, 90],
 -    background_color => '#C0C0C0',
 -    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
 -    event_mask => [ 'structure_notify' ],
 -);
++$window = open_floating_window(rect => [ 20, 20, 80, 90 ]);
  
  isa_ok($window, 'X11::XCB::Window');