← Back to branch summary

~neon/qt/qtscript

Viewing all changes in revision 243.

  • Committer: Frederik Gladhorn
  • Date: 2014-12-17 15:54:19 UTC
  • mfrom: (236.1.19)
  • Revision ID: git-v1:7a290532cc0ff56c05bb7d3dbb8fd00bd568e462
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
        .qmake.conf

Change-Id: Ib2bcdfc23e0e8274e8cc43ed34ec34b1e0cb986d

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: