1. 18 May, 2015 6 commits
  2. 15 May, 2015 4 commits
  3. 14 May, 2015 1 commit
  4. 12 May, 2015 4 commits
  5. 11 May, 2015 11 commits
  6. 10 May, 2015 12 commits
    • Laurent Montel's avatar
      Fix wrong merge reported by Raymond Wooninck · ddd3423d
      Laurent Montel authored
      Thanks
      ddd3423d
    • Laurent Montel's avatar
      Merge remote-tracking branch 'origin/KDE/4.14' · a335119a
      Laurent Montel authored
      Conflicts:
      	pimsettingexporter/CMakeLists.txt
      	pimsettingexporter/abstractimportexportjob.h
      	pimsettingexporter/dialog/backupfilestructureinfodialog.h
      	pimsettingexporter/dialog/selectiontypedialog.h
      	pimsettingexporter/dialog/showarchivestructuredialog.h
      	pimsettingexporter/gui/pimsettingexporter.desktop
      	pimsettingexporter/jot/exportjotjob.h
      	pimsettingexporter/jot/importjotjob.h
      	pimsettingexporter/knode/exportknodejob.h
      	pimsettingexporter/knode/importknodejob.h
      	pimsettingexporter/mail/importmailjob.h
      	pimsettingexporter/org.kde.pimsettingexporter.desktop
      	pimsettingexporter/pimsettingexporter.desktop
      	pimsettingexporter/pimsettingexporterkernel.h
      	pimsettingexporter/widgets/logwidget.h
      a335119a
    • Laurent Montel's avatar
      Move CMakeLists.txt to gui directory · 6c80bd67
      Laurent Montel authored
      6c80bd67
    • Laurent Montel's avatar
      Move in own directory · baf20189
      Laurent Montel authored
      baf20189
    • Laurent Montel's avatar
      Export symbole · e588a7cf
      Laurent Montel authored
      e588a7cf
    • Laurent Montel's avatar
      Use Q_DECL_OVERRIDE · 9be0d9a0
      Laurent Montel authored
      9be0d9a0
    • Laurent Montel's avatar
      Astyle kdelibs · 09ec3cfe
      Laurent Montel authored
      09ec3cfe
    • Laurent Montel's avatar
      Merge remote-tracking branch 'origin/KDE/4.14' · ce96f245
      Laurent Montel authored
      Conflicts:
      	pimsettingexporter/abstractimportexportjob.h
      	pimsettingexporter/addressbook/exportaddressbookjob.cpp
      	pimsettingexporter/akregator/exportakregatorjob.cpp
      	pimsettingexporter/alarm/exportalarmjob.cpp
      	pimsettingexporter/blogilo/exportblogilojob.cpp
      	pimsettingexporter/calendar/exportcalendarjob.cpp
      	pimsettingexporter/calendar/importcalendarjob.h
      	pimsettingexporter/jot/exportjotjob.cpp
      	pimsettingexporter/jot/exportjotjob.h
      	pimsettingexporter/jot/importjotjob.cpp
      	pimsettingexporter/jot/importjotjob.h
      	pimsettingexporter/knode/exportknodejob.cpp
      	pimsettingexporter/knode/exportknodejob.h
      	pimsettingexporter/knode/importknodejob.cpp
      	pimsettingexporter/knode/importknodejob.h
      	pimsettingexporter/mail/exportmailjob.cpp
      	pimsettingexporter/mail/importmailjob.cpp
      	pimsettingexporter/notes/exportnotesjob.cpp
      	pimsettingexporter/pimsettingsbackuprestore.cpp
      	pimsettingexporter/pimsettingsbackuprestore.h
      ce96f245
    • Laurent Montel's avatar
      Clean forward declaration · 8f25dd17
      Laurent Montel authored
      8f25dd17
    • Laurent Montel's avatar
      Autogenerate export file · 9bbe129d
      Laurent Montel authored
      9bbe129d
    • Laurent Montel's avatar
      Remove some gui code · f0555851
      Laurent Montel authored
      f0555851
    • Laurent Montel's avatar
      Merge remote-tracking branch 'origin/KDE/4.14' · 0769772e
      Laurent Montel authored
      Conflicts:
      	pimsettingexporter/abstractimportexportjob.cpp
      	pimsettingexporter/abstractimportexportjob.h
      	pimsettingexporter/pimsettingexporterwindow.cpp
      	pimsettingexporter/pimsettingsbackuprestore.cpp
      0769772e
  7. 09 May, 2015 2 commits