| commit | 456fd843d3f104f7e1378c61b21629c1896f61da | |
| author | Pekka Gehör <pegu6@msn.com> | |
| Thu, 22 Jan 2009 10:55:40 +0000 (22 12:55 +0200) | ||
| committer | Pekka Gehör <pegu6@msn.com> | |
| Thu, 22 Jan 2009 10:55:40 +0000 (22 12:55 +0200) | ||
| tree | b695c6d0260d7af87a8e30f4d37acb8b7b469328 | treesnapshot (tar.gz zip) |
| parent | dd9ee1864462160270a7eb4051cebea6a6f9966b | commitdiff |
| parent | 47c8622c8cf8c28c02225e056954327738bf6bfd | commitdiff |
Merge branch 'master' of ssh://pege77@mercury.wipsl.com/var/git/irreco-theme-editor
Conflicts:
irreco/configure.ac
irreco/debian/changelog
irreco/src/core/button_list.conf
irreco/src/core/irreco_button_creator_dlg.c
irreco/src/core/irreco_theme_creator_dlg.c
irreco/src/core/irreco_theme_manager_dlg.c
Conflicts:
irreco/configure.ac
irreco/debian/changelog
irreco/src/core/button_list.conf
irreco/src/core/irreco_button_creator_dlg.c
irreco/src/core/irreco_theme_creator_dlg.c
irreco/src/core/irreco_theme_manager_dlg.c