Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Wed, 17 Apr 2013 10:49:12 +0000 (12:49 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 17 Apr 2013 10:49:12 +0000 (12:49 +0200)
commit339f770f7577345b5f482d8d0c4e0d46c3058778
tree0b822eabc1053b5f24664d534bf2e3e5550945b0
parent782b2864b1cc5ffab426dfb784a973576a98de18
parent82d330674bf3fef9c3c2f97998a4cabfc14dacc0
Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:
openbox/actions.c
Makefile.am
obt/prop.c
obt/prop.h
openbox/actions.c
openbox/actions/if.c