summaryrefslogtreecommitdiffstats
path: root/kdecore/kmacroexpander.cpp
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-12 22:19:14 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-12 22:19:14 +0000
commitb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (patch)
tree775ed08d953f154791b1246f9dbd2d2f74a57873 /kdecore/kmacroexpander.cpp
parent0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93 (diff)
downloadtdelibs-b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c.tar.gz
tdelibs-b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c.zip
[kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214091 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kmacroexpander.cpp')
0 files changed, 0 insertions, 0 deletions