/b-gtk/fix-viz

(root)/b-gtk/fix-viz » Changes to conflicts.py from revision 797

From Revision 797

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
741		Merge gtk3 support from Curtis. Merge gtk3 support from Curtis.	Jelmer Vernooij	14 years ago
724		Fix formatting, imports. Fix formatting, imports.	Jelmer Vernooij	14 years ago
713		Remove some unused imports, fix some formatting. Remove some unused imports, fix some formatting.	Jelmer Vernooij	14 years ago
490		Merge trunk. Merge trunk.	Jelmer Vernooij	17 years ago
444		Merge a fix for the Conflicts dialog. Merge a fix for the Conflicts dialog.	Szilveszter Farkas (...	17 years ago
254		Merge gconflicts fixes from dato. Merge gconflicts fixes from dato.	Jelmer Vernooij	18 years ago
160		Merge trunk Merge trunk	Jelmer Vernooij	18 years ago