a missed and a failed merge
authorMikael Magnusson <mikachu@comhem.se>
Sun, 27 May 2007 21:37:29 +0000 (21:37 +0000)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 27 May 2007 21:37:29 +0000 (21:37 +0000)
commitf56a8d39b0f52a6a749273bad844ab114f8a24a7
treea08042fc7388428772d4ea1f9d9c49b8fdc69883
parentbea5921ff5cda52fafb3ab0179e76934a06a98f9
a missed and a failed merge
openbox/client.c
openbox/focus_cycle_popup.c