← Back to branch summary

~neon/qt/qtscript

Viewing all changes in revision 245.

  • Committer: Frederik Gladhorn
  • Date: 2015-01-19 13:06:55 UTC
  • mfrom: (236.1.21)
  • Revision ID: git-v1:79f2b17b3e08e6a18e3c02dea98620ad372042eb
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
        .qmake.conf

Change-Id: I7b5322df40680614250e1e6327879ff683c03df5

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: