| commit | 9e82f553abbbf8ed667a8865495d7ba89951c86e | |
| author | Harri Vattulainen <t5vaha01@students.oamk.fi> | |
| Fri, 23 Jan 2009 11:15:38 +0000 (23 13:15 +0200) | ||
| committer | Harri Vattulainen <t5vaha01@students.oamk.fi> | |
| Fri, 23 Jan 2009 11:15:38 +0000 (23 13:15 +0200) | ||
| tree | 48a2ef867a504b775a544d077696f944ccc8964c | treesnapshot (tar.gz zip) |
| parent | 71bcb1b7643497dbb79437cc214f0226eccc327b | commitdiff |
| parent | 9a0c1a32054300624ba990b7a8c4bc5b7ab78caf | commitdiff |
Merge branch 'master' of ssh://harriv@mercury.wipsl.com/var/git/irreco
Conflicts:
irreco/src/core/irreco_config.c
Conflicts:
irreco/src/core/irreco_config.c
| irreco/src/core/irreco_config.c | diff1 | diff2 | blobhistory |