4 Commits

Author	SHA1	Message	Date
guinux	d08e0aac2f	improved conflicts and provides handling	2013-01-30 18:37:41 +01:00
guinux	90b04d0319	continue	2013-01-27 18:15:34 +01:00
guinux	5b50e92cc8	I think I made it (hope, hope)	2013-01-13 16:37:17 +01:00
guinux	5982973656	big rewrite with a dbus service, not finished atm	2013-01-06 19:10:13 +01:00