Merge branch 'master' of git://anongit.kde.org/calligra

Authored by Sven Langkamp <sven.langkamp@gmail.com>.

Description

Merge branch 'master' of git://anongit.kde.org/calligra

Details

Committed
Sven Langkamp <sven.langkamp@gmail.com>Dec 29 2012, 10:58 AM
Parents
R8:8c0ef32ac113: Port the setting of env variables on windows to krita (from sketch)
R8:af2daaae4cad: Merge branch 'master' of git://anongit.kde.org/calligra
Branches
Unknown
Tags
Unknown
Sven Langkamp <sven.langkamp@gmail.com> committed R8:9b76f04928d3: Merge branch 'master' of git://anongit.kde.org/calligra (authored by Sven Langkamp <sven.langkamp@gmail.com>).Dec 29 2012, 10:58 AM

Merged Changes

CommitAuthorDetailsCommitted
8c0ef32ac113Boudewijn Rempt
Port the setting of env variables on windows to krita (from sketch) 
Dec 29 2012