| commit | 1473be2c919b30803cd38df57b0fd7d5e5486251 | |
| author | Harri Vattulainen <t5vaha01@students.oamk.fi> | |
| Wed, 3 Dec 2008 08:40:01 +0000 (3 10:40 +0200) | ||
| committer | Harri Vattulainen <t5vaha01@students.oamk.fi> | |
| Wed, 3 Dec 2008 08:40:01 +0000 (3 10:40 +0200) | ||
| tree | 91111002ad622a3116a703f29646ba37ee9ea1bf | treesnapshot (tar.gz zip) |
| parent | c0700bf8c1aeb2e1b64d6789f9febdd111c98815 | commitdiff |
Fixed conflict
| irreco/src/core/irreco_config.c | diffblobblamehistory | |
| irreco/src/core/irreco_config.h | diffblobblamehistory |