diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-09-08 22:30:41 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-09-08 22:30:41 +0200 |
| commit | 88ecf5ab4e283d246499cf5f869800a99f58e48b (patch) | |
| tree | db74aec18b75237f5bdf43ea1d5bc0ea837f8bb6 | |
| parent | d5526368825c5bbfe204d08d5de3d2069976596d (diff) | |
| parent | 1effb46af267dad5b3232da1711f33ac6ce883c1 (diff) | |
| download | sink-88ecf5ab4e283d246499cf5f869800a99f58e48b.tar.gz sink-88ecf5ab4e283d246499cf5f869800a99f58e48b.zip | |
Merge branch 'develop' of git://anongit.kde.org/akonadi-next into develop
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -1 +1,2 @@ | |||
| 1 | *.swp | 1 | *.swp |
| 2 | *.kdev4 | ||