Commits · d534fbc50bf002a9ca75cace127e029e29d6f6c8 · PIM / KAlarm

23 Sep, 2013 2 commits
- Add generate_export_header compatible KDE_DEPRECATED replacements. · d534fbc5
  Stephen Kelly authored Sep 23, 2013
  
  d534fbc5
- Add another deprecation macro for generate_export_header compatibility. · 12233db9
  Stephen Kelly authored Sep 23, 2013
  
  12233db9
21 Sep, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · 66c1aac5
  Laurent Montel authored Sep 21, 2013
```
Conflicts:
	CMakeLists.txt
```
  66c1aac5
20 Sep, 2013 2 commits
- Merge branch 'KDE/4.11' into master · 9cb6a43b
  Sergio Martins authored Sep 20, 2013
  
  9cb6a43b
- Merge remote-tracking branch 'origin/KDE/4.11' · 16c93fc4
  Laurent Montel authored Sep 20, 2013
  
  16c93fc4
18 Sep, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · c57a978a
  Laurent Montel authored Sep 18, 2013
  
  c57a978a
17 Sep, 2013 1 commit
- Merge branch 'KDE/4.11' into master · 980743c1
  Sergio Martins authored Sep 17, 2013
  
  980743c1
16 Sep, 2013 1 commit
- Merge branch 'KDE/4.11' · b6b367dc
  Sergio Martins authored Sep 17, 2013
  
  b6b367dc
08 Sep, 2013 2 commits
- Merge remote-tracking branch 'origin/KDE/4.11' · d1426bdb
  Allen Winter authored Sep 08, 2013
```
Conflicts:
	akonadi/contact/contactviewerdialog.cpp
```
  d1426bdb
- Merge remote-tracking branch 'origin/KDE/4.11' · 7fd02405
  Allen Winter authored Sep 08, 2013
  
  7fd02405
04 Sep, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · 86f8da0d
  Laurent Montel authored Sep 04, 2013
  
  86f8da0d
03 Sep, 2013 2 commits
- Merge remote-tracking branch 'origin/KDE/4.11' · 651f4ef1
  Laurent Montel authored Sep 03, 2013
  
  651f4ef1
- Merge branch 'KDE/4.11' into master · 2395ec8d
  Sergio Martins authored Sep 03, 2013
  
  2395ec8d
29 Aug, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · 7af7851d
  Christophe Giboudeaux authored Aug 29, 2013
```
Conflicts:
	CMakeLists.txt
```
  7af7851d
25 Aug, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · e16f017e
  Laurent Montel authored Aug 25, 2013
  
  e16f017e
24 Aug, 2013 1 commit
- Use QLatin1* · 044dc762
  Laurent Montel authored Aug 24, 2013
  
  044dc762
20 Aug, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · 17e819a3
  Christophe Giboudeaux authored Aug 20, 2013
  
  17e819a3
19 Aug, 2013 1 commit
- Merge branch 'KDE/4.11' · e13f2ddc
  Daniel Vrátil authored Aug 19, 2013
  
  e13f2ddc
17 Aug, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · b8e6920c
  Pino Toscano authored Aug 17, 2013
```
Conflicts:
	doc/kcontrol/kresources/index.docbook
```
  b8e6920c
09 Aug, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · e8cef5da
  Laurent Montel authored Aug 09, 2013
  
  e8cef5da
07 Aug, 2013 2 commits
- Merge remote-tracking branch 'origin/KDE/4.11' · a619e1db
  Albert Astals Cid authored Aug 07, 2013
  
  a619e1db
- Merge remote-tracking branch 'origin/KDE/4.11' · 4ce3df04
  Laurent Montel authored Aug 07, 2013
  
  4ce3df04
06 Aug, 2013 2 commits
- Merge remote-tracking branch 'origin/KDE/4.11' · 813f86e3
  Albert Astals Cid authored Aug 06, 2013
```
Conflicts:
	CMakeLists.txt
```
  813f86e3
- Merge branch 'KDE/4.11' into master · 38e3c883
  Sergio Martins authored Aug 06, 2013
  
  38e3c883
05 Aug, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.11' · b53a7dd5
  Laurent Montel authored Aug 05, 2013
  
  b53a7dd5
04 Aug, 2013 1 commit
- Merge branch 'KDE/4.11' into master · f4088a4d
  Sergio Martins authored Aug 04, 2013
  
  f4088a4d
29 Jul, 2013 5 commits
- Merge branch 'master' of ssh://git.kde.org/kdepimlibs · 141eea03
  Guy Maurel authored Jul 29, 2013
  
  141eea03
- Merge branch 'KDE/4.11' · a94ea873
  Andras Mantia authored Jul 29, 2013
  
  a94ea873
- Merge branch 'master' of ssh://git.kde.org/kdepimlibs · 44c8af67
  Guy Maurel authored Jul 29, 2013
  
  44c8af67
- Only single empty lines for kalarmcal, #109929 · 3180896f
  Guy Maurel authored Jul 29, 2013
  
  3180896f
- Merge branch 'KDE/4.11' · 2947c9ce
  Daniel Vrátil authored Jul 29, 2013
  
  2947c9ce
28 Jul, 2013 1 commit
- Formatting · 14c0d00c
  David Jarvie authored Jul 29, 2013
  
  14c0d00c
24 Jun, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.10' · 6a7afb5d
  Christophe Giboudeaux authored Jun 24, 2013
```
Conflicts:
	CMakeLists.txt
```
  6a7afb5d
23 Jun, 2013 2 commits

Merge branch 'KDE/4.10' · e474e16a
Raphael Kubo da Costa authored Jun 23, 2013
```
* KDE/4.10:
  Enable exceptions in kalarmcal/ as well.
```
e474e16a

Enable exceptions in kalarmcal/ as well. · 241ab306

Raphael Kubo da Costa authored Jun 23, 2013

clang seems to be more strict than gcc, and complains about exceptions being
disabled despite akonadi/itempayloadinternals_p.h being indirectly included.

241ab306

17 Jun, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.10' · 564184d2
  Laurent Montel authored Jun 17, 2013
  
  564184d2
15 Jun, 2013 2 commits
- Merge branch 'KDE/4.10' · 6bfc5c4b
  David Jarvie authored Jun 15, 2013
  
  6bfc5c4b
- Bug 319261: save sound repeat pause in calendar file for audio alarms · 714c341b
  David Jarvie authored Jun 15, 2013
```
The sound repetition pause was previously only saved for display
alarms with sound files, and not for audio alarms.
```
  714c341b
11 Jun, 2013 1 commit
- Merge remote-tracking branch 'origin/KDE/4.10' · 6af9de4a
  Laurent Montel authored Jun 11, 2013
  
  6af9de4a
08 Jun, 2013 1 commit

Merge remote-tracking branch 'origin/KDE/4.10' · 9546a6f0

Laurent Montel authored Jun 08, 2013

Conflicts:
	kabc/plugins/dir/dir.desktop
	kabc/plugins/file/file.desktop
	kabc/plugins/net/net.desktop

9546a6f0