ajacoutot f324cf6cf5 Tweak conflict marker.

2011-04-07 17:48:22 +00:00

..

pkg

Tweak conflict marker.

2011-04-07 17:48:22 +00:00

distinfo

Import glade-3.10.0 (for gtk+3)

2011-04-06 12:15:55 +00:00

Makefile

Tweak conflict marker.

2011-04-07 17:48:22 +00:00