]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 20:03:10 +0000 (15:03 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 20:03:10 +0000 (15:03 -0500)
commitc70379fa8f771e499a4d47e84af06d71838b780d
tree0f244d32b2069c0b8d68895e34532bfaf98d9392
parent9676757a08b3e2e508c47f7795326bda8e54dc53
parentb8960827b76ad499170e8b5b9ae8bf202188f0b0
Merge branch 'backport' into work
openbox/actions/session.c
openbox/client.c
openbox/prompt.c
openbox/prompt.h
po/POTFILES.in