icculus.org git repositories - dana/openbox.git/commit

]> icculus.org git repositories - dana/openbox.git/commit - po/en@quot.po

author	Dana Jansens <danakj@orodu.net>
	Thu, 31 Jan 2008 17:36:06 +0000 (12:36 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Thu, 31 Jan 2008 17:51:38 +0000 (12:51 -0500)
commit	20b8fcfa33feeade5946bc7f3046705da5d164fe
tree	5199d13a9f18aa90ce51244c3c3eb6685d7673ab	tree
parent	dc94a241c30484611688a8bfb5515577f017529e	commit \| diff
parent	d11ac82062d729be5d63c9c40c5c2bb312a8b8f1	commit \| diff

Merge branch 'backport' into work

Conflicts:

openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c

24 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.am	diff1 \|	diff2 \|	blob \| history
data/rc.xml	diff1 \|	diff2 \|	blob \| history
openbox/actions.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/execute.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/config.h	diff1 \|	diff2 \|	blob \| history
openbox/dock.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_indicator.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
openbox/framerender.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/moveresize.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/popup.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
openbox/stacking.c	diff1 \|	diff2 \|	blob \| history
openbox/startupnotify.c	diff1 \|	diff2 \|	blob \| history
render/theme.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.am	diff1 \|	diff2 \|	blob \| history
data/rc.xml	diff1 \|	diff2 \|	blob \| history
openbox/actions.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/execute.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/config.h	diff1 \|	diff2 \|	blob \| history
openbox/dock.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_indicator.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
openbox/framerender.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/moveresize.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/popup.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
openbox/stacking.c	diff1 \|	diff2 \|	blob \| history
openbox/startupnotify.c	diff1 \|	diff2 \|	blob \| history
render/theme.c	diff1 \|	diff2 \|	blob \| history