4 Commits

Author	SHA1	Message	Date
guinux	5ecbbbd9c3	fix handling conflicts (I hope)	2012-12-29 15:06:44 +01:00
guinux	c82c493e8a	really have no brain	2012-12-26 11:09:14 +01:00
guinux	243cb55dcc	last adjustements (hope)	2012-12-26 10:27:49 +01:00
guinux	77940c5eee	add desktop, icon and setup files	2012-12-24 16:29:59 +01:00