summaryrefslogtreecommitdiff
path: root/libopie/owait.cpp
authorwaspe <waspe>2003-11-03 18:29:32 (UTC)
committer waspe <waspe>2003-11-03 18:29:32 (UTC)
commit3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (patch) (side-by-side diff)
tree96119aac19a49850a221d34f3152fa12b0a86a46 /libopie/owait.cpp
parent87a9d6badcf518ffd14559ef886ff7729b63b73b (diff)
downloadopie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.zip
opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.gz
opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.bz2
remove merge conflict
Diffstat (limited to 'libopie/owait.cpp') (more/less context) (show whitespace changes)
0 files changed, 0 insertions, 0 deletions