Viewing all changes in revision 95.
- Committer: Frederik Gladhorn
- Date: 2015-01-19 13:07:35 UTC
- mfrom: (92.1.11)
- Revision ID: git-v1:22680333bd6748106afce258255e1201ae5493f8
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I0fc53f8e4d20531211035833eebda9a7b7231c7f
Conflicts:
.qmake.conf
Change-Id: I0fc53f8e4d20531211035833eebda9a7b7231c7f
expand all
collapse all
added
removed