Fix merge code
authorAndrea Diamantini <adjam7@gmail.com>
Sun, 31 Oct 2010 08:47:09 +0000 (09:47 +0100)
committerAndrea Diamantini <adjam7@gmail.com>
Sun, 31 Oct 2010 08:47:09 +0000 (09:47 +0100)
commitab7549c7fe58b7375b527f10291dc3ca454dd9e0
treee8ffc5c51cd6afe6bba317ed97a9211ef6a9c82a
parent969d14892e1903bb487d484aa5c5590c6f3a1dc9
Fix merge code
src/opensearch/opensearchengine.cpp
src/opensearch/opensearchengine.h
src/opensearch/opensearchmanager.cpp
src/opensearch/opensearchmanager.h
src/opensearch/opensearchreader.cpp
src/opensearch/opensearchwriter.cpp
src/opensearch/suggestionparser.cpp
src/opensearch/suggestionparser.h