zhuk b24cebe627 Add @conflict markers, reminded by jeremy@. ...

This would NOT create any bulk builds havoc because only one version of
ruby-qt is linked at the time. Could be deconflicted with a bit of patching
but this is not a high priority for now.

2013-10-15 18:15:45 +00:00

..

pkg

Add @conflict markers, reminded by jeremy@.

2013-10-15 18:15:45 +00:00

distinfo

Update to KDE 4.10.5. Some highlights:

2013-07-04 00:44:21 +00:00

Makefile

Add @conflict markers, reminded by jeremy@.

2013-10-15 18:15:45 +00:00