Merge branch 'master' into gsoc-dir-split
commit065f1cdc96fce69856e82088ac66db7fa3a10102
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sun, 25 Jul 2010 13:46:15 +0000 (25 15:46 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sun, 25 Jul 2010 13:46:15 +0000 (25 15:46 +0200)
tree05cddcbb5aa437c3a73ec9236d83f38a08296590
parent1b57b154cf2a259b4289d6e75cbe22ee7bf0b942
parent0f650d09863d41f5a5c41ecc5668d6fd1b6d423d
Merge branch 'master' into gsoc-dir-split
apps/gui/theme_settings.c