]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'imlib2' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Mon, 28 Apr 2008 22:08:57 +0000 (00:08 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Mon, 28 Apr 2008 22:08:57 +0000 (00:08 +0200)
commitba3acf3148184d1591aba3498335d6d9f66d7af1
tree0c4611c318dc51afa9bb95057b75e6053d30ca09
parent953dcb9c8b72861b2e82d9d01c2b00de510fcc14
parentf3f3be131d1b6c596b3390eeefdd5f0f830b5166
Merge branch 'imlib2' into wip/mikabox

Conflicts:

Makefile.am
openbox/config.c
openbox/menu.c
Makefile.am
configure.ac
openbox/config.c
openbox/config.h
openbox/menu.c
render/image.c
render/render.h