| commit | d6bf66d2d0b8f7ce186e3b8433d6541e9d224903 | |
| author | Joni Kokko <t5kojo01@students.oamk.fi> | |
| Wed, 21 Jan 2009 14:55:54 +0000 (21 16:55 +0200) | ||
| committer | Joni Kokko <t5kojo01@students.oamk.fi> | |
| Wed, 21 Jan 2009 14:55:54 +0000 (21 16:55 +0200) | ||
| tree | 6088f305fe112e5eeaa8aea15ad739ecfe1d8111 | treesnapshot (tar.gz zip) |
| parent | 603c087447542e7a37dc166a0a3bf13c91821130 | commitdiff |
| parent | f381c9de944c516632f4b678f8d9ef9374913b0e | commitdiff |
Merge branch 'master' of ssh://jonik@koulukas/var/git/leiska
Conflicts:
irreco/src/core/irreco_remote_upload_dlg.c
Conflicts:
irreco/src/core/irreco_remote_upload_dlg.c
| irreco/src/core/irreco_remote_upload_dlg.c | diff1 | diff2 | blobhistory |