Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sun, 20 Sep 2009 14:04:08 +0000 (16:04 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sun, 20 Sep 2009 14:04:08 +0000 (16:04 +0200)
commit4c11fc86671fa3e9278bb0b48e138e6f36299f60
treeb066513ffb62f7b1aa289e6f6422ccef852fe13c
parent02ff648397d92e2d74f8ed08fb66677dcbc0cd9a
parenta92c209fc1845cf3f3acdfa3f9e8f0930fd53eb3
Merge branch 'work' into wip/mikabox

Conflicts:
openbox/actions/all.c
openbox/actions/all.h
13 files changed:
Makefile.am
openbox/actions/all.c
openbox/actions/all.h
openbox/actions/desktop.c
openbox/actions/directionalwindows.c
openbox/actions/growtoedge.c
openbox/actions/maximize.c
openbox/actions/moveresizeto.c
openbox/actions/movetoedge.c
openbox/client.c
openbox/client.h
openbox/event.c
render/color.c