Public Git Hosting - irreco.git/commit

commit	09efabce3c21e88a04c7bebc1d1029c409940a6c
author	Sami Parttimaa <t5pasa02@students.oamk.fi>
	Wed, 5 Nov 2008 14:39:37 +0000 (5 16:39 +0200)
committer	Sami Parttimaa <t5pasa02@students.oamk.fi>
	Wed, 5 Nov 2008 14:39:37 +0000 (5 16:39 +0200)
tree	af306a2dd9efa47e05d5c12b22afe3890c1c4667	tree \| snapshot (tar.gz zip)
parent	6a05e3189e411aa32b2ebe67ad633e97d8b7c4bc	commit \| diff
parent	385a6c6aa03b908127a1140c2935b9e06a0b1f4d	commit \| diff

Merge conflicts repaired.
Merge branch 'master' into dev

Conflicts:

irreco/src/util/irreco_keyfile.c
irreco/src/webdb/irreco_webdb_cache.c

Irreco is a remote control application for Nokia Internet Tablets.

irreco/src/core/irreco_theme_manager_dlg.c	diff1 \|	diff2 \|	blob \| history
irreco/src/util/irreco_keyfile.c	diff1 \|	diff2 \|	blob \| history
irreco/src/util/irreco_keyfile.h	diff1 \|	diff2 \|	blob \| history
irreco/src/webdb/irreco_webdb_client.c	diff1 \|	diff2 \|	blob \| history