Merge branch 'kde'
authorMartin Engelmann <murphi.oss@googlemail.com>
Sun, 12 Feb 2012 13:38:29 +0000 (14:38 +0100)
committerMartin Engelmann <murphi.oss@googlemail.com>
Sun, 12 Feb 2012 13:38:29 +0000 (14:38 +0100)
commit985fdd5768d859d5d534b8c2ecab64df3dbb2e95
treedb46b16aa132b16ecf2e211a0c48d598c5f0ec40
parentef47fc353b047d784fa8e1f143895fa836f7a253
parente82e4201c8ee9cc3b015171157f975d1170289fd
Merge branch 'kde'

Conflicts:
CMakeLists.txt
src/icord-viewer/aboutdialog.cpp
src/icord-viewer/actions.cpp
src/icord-viewer/filterwidget.cpp
src/icord-viewer/icordviewer.cpp
src/icordrc/main.cpp
src/icord-viewer/CMakeLists.txt
src/icord-viewer/actions.cpp
src/icord-viewer/filterwidget.cpp
src/icordrc/main.cpp