Viewing all changes in revision 37.

Committer: Tarmac
Author(s): Łukasz 'sil2100' Zemczak
Date: 2013-07-19 11:12:50 UTC
mfrom: <a title="Merged From 35.2.1" href="/~phablet-team/qtubuntu-cameraplugin-fake/trunk/revision/35.2.1">(35.2.1 qtubuntu-cameraplugin-fake)
Revision ID: tarmac-20130719111250-ikilzcjmflk5tn0q

As per Didier's advice, Breaks is not necessary here, Conflicts is enough.

Approved by Didier Roche, PS Jenkins bot.

added added

removed removed