Dogcows Code - chaz/openbox/commit

]> Dogcows Code - chaz/openbox/commit

author	Dana Jansens <danakj@orodu.net>
	Mon, 11 Jan 2010 21:20:53 +0000 (16:20 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Mon, 11 Jan 2010 21:20:53 +0000 (16:20 -0500)
commit	567fd15eebdd44e50cef140419dbf7a336708109
tree	3b3691719c704d6da4454bd78e17ec8b495ee76a	tree \| snapshot
parent	3e9dbc01430193035e3d1f5832c019c3f9623db8	commit \| diff
parent	e8200ae603f33b70824c125ba6b37bfaec7d89ea	commit \| diff

Merge branch 'backport' into work

Conflicts:

configure.ac
data/rc.xml
openbox/client.c
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
version.h.in

18 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
data/rc.xml	diff1 \|	diff2 \|	blob \| history
obt/prop.c	diff1 \|	\|	blob \| history
obt/prop.h	diff1 \|	\|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client.h	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/focus.c	diff1 \|	diff2 \|	blob \| history
openbox/focus.h	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle.h	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.h	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
version.h.in	\|	diff2 \|	blob \| history

my patches for the openbox window manager

RSS Atom

This page took 0.036301 seconds and 4 git commands to generate.

configure.ac	diff1 \|	diff2 \|	blob \| history
data/rc.xml	diff1 \|	diff2 \|	blob \| history
obt/prop.c	diff1 \|	\|	blob \| history
obt/prop.h	diff1 \|	\|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client.h	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/focus.c	diff1 \|	diff2 \|	blob \| history
openbox/focus.h	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle.h	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.h	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
version.h.in	\|	diff2 \|	blob \| history