diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-25 10:45:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-25 10:45:58 +0200 |
| commit | 0a1bdf425786b8df6a399a181ee692fc0b4e9e98 (patch) | |
| tree | c0a6ebb7083f3e49440a5eaa9dd7c9857e006ee1 /dist | |
| parent | b9e21803d603c268328d0732cfa863ac3845620b (diff) | |
| parent | becdcdc4f4c6c30e72e30c726c657a796a499b3b (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/share.qbs
tests/auto/icheckbuild/icheckbuild.pro
Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-2.6.0 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/dist/changes-2.6.0 b/dist/changes-2.6.0 index 766cf26b72..fbcc24ca81 100644 --- a/dist/changes-2.6.0 +++ b/dist/changes-2.6.0 @@ -165,6 +165,7 @@ Credits go to: André Pönitz Aurélien Gâteau Aurindam Jana + axasia Bill King BogDan Vatra Bojan Petrovic @@ -185,17 +186,20 @@ Credits go to: Fawzi Mohamed Flex Ferrum Francois Ferrand + Franklin Weng Friedemann Kleint hluk Hugues Delorme Jarek Kobus Jędrzej Nowacki - Joerg Bornemann + Jörg Bornemann Jonathan Liu + Juei-ray Tseng Juhapekka Piiroinen Kaffeine Kai Köhne - kh1 + Kevin Krammer + Karsten Heimrich Knut Petter Svendsen Konstantin Ritt Konstantin Tokarev @@ -208,6 +212,7 @@ Credits go to: Marius Storm-Olsen Martin Aumüller Mathias Hasselmann + Mehdi Fekari Montel Laurent Morten Johan Sorvig Nicolas Arnaud-Cormos @@ -217,17 +222,21 @@ Credits go to: Oto Magaldadze Peter Kümmel Pierre Rossi - Robert Loehning + Przemyslaw Gorszkowski + raidsan + Robert Löhning Ryan May Sergey Belyashov Sergey Shambir + Sergio Ahumada Simjees Abraham + Stephen Kelly Takumi Asaki Theo J.A. de Vries Thiago Macieira Thomas Hartmann Thorbjørn Lindeijer - tjenssen + Tim Jenssen Tobias Hunger Tobias Nätterlund Tommi Asp |