summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-03 18:35:45 (UTC)
committer waspe <waspe>2003-11-03 18:35:45 (UTC)
commitc0fe2d62abe68de74de6b8bf91635c1cdaf5d239 (patch) (unidiff)
tree396acfe28669ac49037fef03d39f8c0e1d038562
parent3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (diff)
downloadopie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.zip
opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.tar.gz
opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.tar.bz2
reolved merge conflict
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/doclnksearch.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 3428798..ef0e482 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -88,4 +88,6 @@ QPopupMenu* DocLnkSearch::popupMenu()
88 actionSearchInFiles->addTo( _popupMenu ); 88 actionSearchInFiles->addTo( _popupMenu );
89 } 89 }
90 return _popupMenu; 90 return _popupMenu;
91 (void) new DocLnkItem( this, (DocLnk*)rec );
92 _resultCount++;
91} 93}