Merge branch 'imlib-submenus' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Wed, 10 Sep 2008 15:17:51 +0000 (17:17 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 10 Sep 2008 15:17:51 +0000 (17:17 +0200)
commita944da6811f120c373401813a42b77ebb6563e66
treeef96179d1fbec6c1bbf529ffbf4a68c9cca1a4b8
parent8d2bd400a64c34b9e8fa1b0a5f64d9a61816ce32
parent9ff9e27b73bfcc7edac4f22c9ac539eddf7d326f
Merge branch 'imlib-submenus' into wip/mikabox