summaryrefslogtreecommitdiff
path: root/library/qpetoolbar.cpp
authorzecke <zecke>2003-06-10 17:49:00 (UTC)
committer zecke <zecke>2003-06-10 17:49:00 (UTC)
commitc6f88a48ccc13940e2b2a433f2976dd35e0d8f9e (patch) (unidiff)
tree544779a32c217d5186698c4129e2922da9524e9a /library/qpetoolbar.cpp
parentd2f78d2aba17a491739d10bd73f6fce033849537 (diff)
downloadopie-c6f88a48ccc13940e2b2a433f2976dd35e0d8f9e.zip
opie-c6f88a48ccc13940e2b2a433f2976dd35e0d8f9e.tar.gz
opie-c6f88a48ccc13940e2b2a433f2976dd35e0d8f9e.tar.bz2
cvs is so crappy in not moving the branch point after a merge with HEAD that later merges ends up in tons of conflicts or cvs strikes... so remove and add it again.. yuppie
Diffstat (limited to 'library/qpetoolbar.cpp') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions