summaryrefslogtreecommitdiffstats
path: root/src/fbgui/interfaceconfiguration.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2012-02-03 17:30:16 +0100
committerJonathan Bauer2012-02-03 17:30:16 +0100
commit32ada7c4adb37ebb82005f024d25cae129904df3 (patch)
tree87b4dffd9ec3e56771294d72e980300f8310dd21 /src/fbgui/interfaceconfiguration.cpp
parentmerge cleanup branch (diff)
downloadfbgui-32ada7c4adb37ebb82005f024d25cae129904df3.tar.gz
fbgui-32ada7c4adb37ebb82005f024d25cae129904df3.tar.xz
fbgui-32ada7c4adb37ebb82005f024d25cae129904df3.zip
fix merge error
Diffstat (limited to 'src/fbgui/interfaceconfiguration.cpp')
0 files changed, 0 insertions, 0 deletions