diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
| commit | b7ff6c33309224a4e598a0691e7cb2dc353a6ace (patch) | |
| tree | bc003a5aeba3b0980b5098985f6c28ba965b8b52 /tdecore/ksimpleconfig.cpp | |
| parent | 34f10b970c1e644842ef737b5504591997e37d59 (diff) | |
| parent | 411486cc50448e91b53d28119ccec54c5c2305cd (diff) | |
| download | tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.tar.gz tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.zip | |
Merge branch 'master' into HEAD
Conflicts:
tdecore/CMakeLists.txt
tdecore/tdehardwaredevices.h
tdecore/tdehw/tdehardwaredevices.cpp
Diffstat (limited to 'tdecore/ksimpleconfig.cpp')
0 files changed, 0 insertions, 0 deletions