git.openbox.org Git - mikachu/openbox.git/commit

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 339f770 6d848df)

author	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 10:50:22 +0000 (12:50 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 10:50:22 +0000 (12:50 +0200)
commit	c4372f168192622971ef36ebd050fb020e3fee65
tree	58eaecaa5a31374cf998d99cce16880e2c5fa4c4	tree \| snapshot
parent	339f770f7577345b5f482d8d0c4e0d46c3058778	commit \| diff
parent	6d848df9d991ab7953116dd40888f155cc2b9c99	commit \| diff

Merge branch 'mikabox/lock' into wip/mikabox

Conflicts:
openbox/event.c

13 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
obt/prop.c	diff1 \|	diff2 \|	blob \| history
obt/prop.h	diff1 \|	diff2 \|	blob \| history
openbox/actions.c	diff1 \|	diff2 \|	blob \| history
openbox/actions.h	diff1 \|	diff2 \|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/if.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/moveresizeto.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/resizerelative.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client.h	diff1 \|	diff2 \|	blob \| history
openbox/client_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager