| commit | de6e9f6c4eb5349111ce7b082d01bc3a7dafc228 | |
| author | Joni Kokko <t5kojo01@students.oamk.fi> | |
| Wed, 21 Jan 2009 09:28:32 +0000 (21 11:28 +0200) | ||
| committer | Joni Kokko <t5kojo01@students.oamk.fi> | |
| Wed, 21 Jan 2009 09:28:32 +0000 (21 11:28 +0200) | ||
| tree | ff0943bb4fac7e5474641577ad36d32cf20da742 | treesnapshot (tar.gz zip) |
| parent | 5ea74b9d2ec1af44f4c495772a98775e4a644902 | commitdiff |
| parent | 414ea8b30102f5b168284bc9e2577112946d86e1 | 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