| commit | 989eab38fb405f727fa698cad73cbb03bc8a36e3 | |
| author | Pekka Gehör <pegu6@msn.com> | |
| Wed, 12 Nov 2008 09:12:30 +0000 (12 11:12 +0200) | ||
| committer | Pekka Gehör <pegu6@msn.com> | |
| Wed, 12 Nov 2008 09:12:30 +0000 (12 11:12 +0200) | ||
| tree | e69421fc879cf089be622e08d6674dcf00a0f845 | treesnapshot (tar.gz zip) |
| parent | adf08a62e62fc24d2f8b1d4548961837573edc08 | commitdiff |
| parent | 3a276fa131be71d00bf6da1592f11c6dac10d301 | commitdiff |
Merge branch 'master' into new
Conflicts:
irreco/src/core/irreco_theme_manager_dlg.c
Conflicts:
irreco/src/core/irreco_theme_manager_dlg.c
| irreco/src/core/irreco_background_dlg.c | diff1 | diff2 | blobhistory |
| irreco/src/core/irreco_theme_manager_dlg.c | diff1 | diff2 | blobhistory |
| irreco/src/core/irreco_theme_manager_dlg.h | diff1 | diff2 | blobhistory |