Public Git Hosting - irreco.git/commit

commit	3ee11290dca037d3285974a9b90f7a2e6b5d04ee
author	Joni Kokko <t5kojo01@students.oamk.fi>
	Wed, 21 Jan 2009 08:47:55 +0000 (21 10:47 +0200)
committer	Joni Kokko <t5kojo01@students.oamk.fi>
	Wed, 21 Jan 2009 08:47:55 +0000 (21 10:47 +0200)
tree	13d4c1bfaa4b861c4fa5ea065e84e892dc42f6f2	tree \| snapshot (tar.gz zip)
parent	c8ffd02600aded22726327808be89b37dd4c9b25	commit \| diff
parent	ad62db09d43ab9166da4e1f3461447c9c70e545e	commit \| diff

Merge branch 'master' of ssh://jonik@koulukas/var/git/leiska

Conflicts:

irreco/src/core/irreco_remote_download_dlg.c
irreco/src/core/irreco_remote_download_dlg.h
irreco/src/core/irreco_remote_upload_dlg.c
irreco/src/core/irreco_remote_upload_dlg.h
irreco/src/webdb/irreco_webdb_cache.c
irreco/src/webdb/irreco_webdb_cache.h
irreco/src/webdb/irreco_webdb_client.c

Irreco is a remote control application for Nokia Internet Tablets.

RSS Atom

database/php/irreco_webdb_database.php	diff1 \|	diff2 \|	blob \| history
database/php/irreco_webdb_server.php	diff1 \|	diff2 \|	blob \| history
irreco/src/core/irreco_config.h	diff1 \|	diff2 \|	blob \| history
irreco/src/core/irreco_remote_upload_dlg.c	diff1 \|	diff2 \|	blob \| history