6 Commits

Author	SHA1	Message	Date
ajacoutot	dc4f6bf048	It seems the @conflict marker format changed...	2011-10-02 16:11:11 +00:00
jasper	6a8b83abeb	sync after recent gnome.port.mk CONFIGURE_ENV changes	2011-09-28 09:47:46 +00:00
jasper	d6afa123c7	fix the other conflict marker too..	2011-09-26 15:17:25 +00:00
ajacoutot	98afa6b86e	Fix conflict marker.	2011-09-26 15:10:34 +00:00
jasper	b216479d54	missing conflict marker	2011-09-26 14:41:57 +00:00
jasper	d026e5f5ae	import vte 0.30.0 (gtk3 only)	2011-09-26 14:31:33 +00:00