summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-23 22:02:17 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-23 22:02:17 +0200
commit768f3d93019b262ce6aa9f913aed0f45d5e4c929 (patch)
tree0eee9d83a498b1f18def288848f54551881b778d /src/keyboardconfig.cpp
parentcc2cd67e1c3c3f95485ae4477b6a2f0d255e9163 (diff)
parentfbbd4c406bf95ef8591f7368baacfad6f4d3f30f (diff)
downloadMana-768f3d93019b262ce6aa9f913aed0f45d5e4c929.tar.gz
Mana-768f3d93019b262ce6aa9f913aed0f45d5e4c929.tar.bz2
Mana-768f3d93019b262ce6aa9f913aed0f45d5e4c929.tar.xz
Mana-768f3d93019b262ce6aa9f913aed0f45d5e4c929.zip
Merge branch '0.0.29'
Conflicts: src/gui/widgets/chattab.cpp
Diffstat (limited to 'src/keyboardconfig.cpp')
0 files changed, 0 insertions, 0 deletions