[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-01-08 0:04:10
Message-ID: 1231373050.361359.22961.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 907401 by tmcguire:

Add the Kolab team (Intevation, KDAB, g10) to the about dialog of Kontact.
Any objections to this? I think they well deserve the credit. But then, I
might be a bit biased :)

CCMAIL: kde-pim@kde.org

--
Merged revisions 906910 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r906910 | pradeepto | 2009-01-07 05:00:04 +0100 (Wed, 07 Jan 2009) | 2 lines
  
   -- Adding credit roll for e4/kontact.
........


 _M            . (directory)  
 M  +96 -0     kontact/src/aboutdialog.cpp  


** trunk/KDE/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434 \
-835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,8 \
36404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840 \
017,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,84375 \
2-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002,866383,866597,8666
  82,866739,867069,867093,867475,867479,867497,868399-868400,868510,868512,868517,8685 \
33,868546,868795,868797,868813-868814,868935,869610,869627,869630,871375,872627-872628 \
,872861,872863,872887,872959,872969,873832,874391,874421,874707,874709,875182-875183,8 \
75188-875466,875468-875505,876312,876371,876380,876554,876637,876866,877028,877087,877 \
093,877099,877101-877103,877128-877129,877464,877481,877792,877794,877816,877930,87959 \
8-882331,882333-883958,883960-883963,883965-883968,883970,883972-883975,883977-883981, \
883983,883987,883993-883995,883997-883998,884002-884008,884015-884327,884329-885958,88 \
5960-887405,887407,887409-887663,887665-888956,888958-889343,889345-889353,889355-8893 \
56,889358-889363,889365-890603,894938,896104,896117,896122,898168,898171,898186,898616,898658,898963,898966-898974,898976-899293,900455,900706,903577,905807
  + /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-81 \
3603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-8186 \
95,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,829049 \
-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977-8 \
34992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,835 \
088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,83538 \
2-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434- \
835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,83 \
6404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-8400 \
17,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,843752 \
-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
  0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002,866383,866597,8666
  82,866739,867069,867093,867475,867479,867497,868399-868400,868510,868512,868517,8685 \
33,868546,868795,868797,868813-868814,868935,869610,869627,869630,871375,872627-872628 \
,872861,872863,872887,872959,872969,873832,874391,874421,874707,874709,875182-875183,8 \
75188-875466,875468-875505,876312,876371,876380,876554,876637,876866,877028,877087,877 \
093,877099,877101-877103,877128-877129,877464,877481,877792,877794,877816,877930,87959 \
8-882331,882333-883958,883960-883963,883965-883968,883970,883972-883975,883977-883981, \
883983,883987,883993-883995,883997-883998,884002-884008,884015-884327,884329-885958,88 \
5960-887405,887407,887409-887663,887665-888956,888958-889343,889345-889353,889355-8893 \
56,889358-889363,889365-890603,894938,896104,896117,896122,898168,898171,898186,898616,898658,898963,898966-898974,898976-899293,900455,900706,903577,905807,906910
                
--- trunk/KDE/kdepim/kontact/src/aboutdialog.cpp #907400:907401
@@ -128,6 +128,102 @@
 
     text = "";
 
+    text +="\
+    <i>This Free Software product was improved as part of a commercial project:</i>\
+    <h3>Credits</h3>\
+    v20080902.2  Project Kowi (March 2007 - )<br /><br />\
+    \
+    <b>Production / Project Coordination</b><br />\
+    Bernhard Reiter<br />\
+    <b>Director of Development</b><br />\
+    Till Adam\
+    <br /><br />\
+    \
+    <table border=\"0\" width=\"100%\"> \
+    <tr>\
+     <td colspan=\"2\">\
+      <b>Osnabr&uuml;ck Unit, Intevation GmbH</b>\
+     </td>\
+    </tr>\
+    <tr>\
+     <td width=\"60%\">\
+      Unit Lead<br />\
+      Senior QA, Packaging<br />\
+      QA, Packaging<br />\
+      Additional NSIS<br />\
+      Backup Coordinator\
+     </td>\
+     <td>\
+      Bernhard Reiter<br />\
+      Bernhard Herzog<br />\
+      Ludwig Reiter<br />\
+      Emanuel Sch&uuml;tze<br />\
+      Dr. Jan-Oliver Wagner\
+     </td>\
+    </tr>\
+    </table>\
+    <br /><br />\
+    \
+    <table border=\"0\" width=\"100%\">\
+    <tr>\
+     <td colspan=\"2\">\
+        <b>Berlin Unit, Klar&auml;lvdalens Datakonsult AB</b>\
+     </td>\
+    </tr>\
+    <tr>\
+     <td width=\"60%\">\
+      Unit Lead<br />\
+      Development<br />\
+      Development<br />\
+      Additional D. + Crypto<br />\
+      Crypto GUI Development\
+     </td>\
+     <td>\
+      Till Adam<br />\
+      Jaroslaw Staniek<br />\
+      Volker Krause<br />\
+      Frank Osterfeld<br />\
+      Marc Mutz\
+     </td>\
+    </tr>\
+    </table>\
+    <br /><br />\
+    \
+    <table border=\"0\" width=\"100%\">\
+    <tr>\
+     <td colspan=\"2\">\
+      <b>D&uuml;sseldorf Unit, g10 Code GmbH</b>\
+     </td>\
+    </tr>\
+    <tr>\
+     <td width=\"60%\">\
+      Crypto-Backend Porting<br />\
+      Crypto-Backend\
+     </td>\
+     <td>\
+      Werner Koch<br />\
+      Marcus Brinkmann\
+     </td>\
+    </tr>\
+    </table>\
+    <br /><br />\
+    \
+    <table border=\"0\" width=\"100%\">\
+    <tr>\
+     <td colspan=\"2\">\
+      <b>External QA Darmstadt, basysKom GmbH</b>\
+     </td>\
+    </tr>\
+    <tr>\
+     <td width=\"60%\">\
+      Unit-Lead\
+     </td>\
+     <td>\
+      Dr. Stefan Werden\
+     </td>\
+    </tr>\
+    </table><br /><br />";
+
     const QList<KAboutPerson> authors = about->authors();
     if ( !authors.isEmpty() ) {
       text += i18n( "<p><b>Authors:</b></p>" );


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic