- Committer: Sergio Ahumada
- Date: 2013-08-05 08:40:18 UTC
- mfrom: (139.1.24)
- Revision ID: git-v1:ac8ff6bca583f73efcf172d89534e95769618abc
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb
Conflicts:
.qmake.conf
Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
dist
|
141 | 11 years ago | Frederik Gladhorn | Merge remote-tracking branch 'origin/stable' into |
|
||
|
src
|
1 | 12 years ago | Kim Gronholm | Initial commit |
|
||
|
tests
|
1 | 12 years ago | Kim Gronholm | Initial commit |
|
||
|
tools
|
1 | 12 years ago | Kim Gronholm | Initial commit |
|
||
.gitattributes |
130 | 12 years ago | Qt by Nokia | Update the git-archive export options The .gitatt | 89 bytes |
|
|
|
.qmake.conf |
146 | 11 years ago | The Qt Project | Update module version to 5.2.0 Change-Id: I3a2882 | 46 bytes |
|
|
|
.tag |
130 | 12 years ago | Qt by Nokia | Update the git-archive export options The .gitatt | 12 bytes |
|
|
|
LGPL_EXCEPTION.txt |
139.1.16 | 11 years ago | The Qt Project | Add license files mandated by (L)GPL. Currently o | 1.1 KB |
|
|
|
LICENSE.FDL |
139.1.16 | 11 years ago | The Qt Project | Add license files mandated by (L)GPL. Currently o | 22.4 KB |
|
|
|
LICENSE.GPL |
139.1.16 | 11 years ago | The Qt Project | Add license files mandated by (L)GPL. Currently o | 34.3 KB |
|
|
|
LICENSE.LGPL |
139.1.16 | 11 years ago | The Qt Project | Add license files mandated by (L)GPL. Currently o | 26.1 KB |
|
|
|
qtgraphicaleffects.pro |
134.1.3 | 11 years ago | Jerome Pasion | Doc: Cleaned up QDoc config file and enabled "make | 15 bytes |
|
|
|
sync.profile |
139.1.18 | 11 years ago | The Qt Project | sync.profile: Point dependencies to an empty strin | 597 bytes |
|
|