guinux 5ecbbbd9c3 fix handling conflicts (I hope)		2012-12-29 15:06:44 +01:00
..
dialogs.glade	fix handling conflicts (I hope)	2012-12-29 15:06:44 +01:00
pamac.glade	use icons	2012-12-26 19:25:33 +01:00
pamac_update.glade	use icons	2012-12-26 19:25:33 +01:00