summaryrefslogtreecommitdiff
path: root/library/qpeapplication.h
authorwaspe <waspe>2003-11-04 17:18:09 (UTC)
committer waspe <waspe>2003-11-04 17:18:09 (UTC)
commitdcb673c3b856bc0392414116d36659f5f4bf18a5 (patch) (unidiff)
tree6f5903334cb7457552082909d70a16dd7f2b049f /library/qpeapplication.h
parent8dc71d4826633fba63618a509e84ca4a30f5addb (diff)
downloadopie-dcb673c3b856bc0392414116d36659f5f4bf18a5.zip
opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.gz
opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.bz2
resolved merge conflict
Diffstat (limited to 'library/qpeapplication.h') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions