~bzoltan/qtcreator-plugin-cmake/join_the_train

Viewing all changes in revision 30.

  • Committer: Timo Jyrinki
  • Author(s): Iain Lane
  • Date: 2014-03-17 10:15:11 UTC
  • mfrom: (29.1.3 qtcreator-plugin-cmake)
  • Revision ID: timo.jyrinki@canonical.com-20140317101511-y8854id82w2fk83u
[ Zoltan Balogh ]
* Fix conflict with earlier version of QtC (LP: #1293022)
[ Iain Lane ]
* Use Breaks instead of Conflicts, as is standard for file moves (policy
  §7.6.1)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: