← Back to branch summary

~neon/qt/qtdoc

Viewing all changes in revision 700.1.1.

  • Committer: Frederik Gladhorn
  • Date: 2015-02-16 09:40:20 UTC
  • mfrom: (674.1.74)
  • mto: This revision was merged to the branch mainline in revision 702.
  • Revision ID: git-v1:0c543b38cb62c659b26417dce86779dddedf2a1a
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
        .qmake.conf

Change-Id: Ie8891dbd2299655fd87053e11642f6e4332ae527

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: