Merge

--HG--
branch : RECOLL_1_22_MAINT

Jean-Francois Dockes Jean-Francois Dockes 2016-07-12

removed packaging/debian/debiankio/patches
removed packaging/debian/debiankio/patches/fix-cmake-build-parser.patch
removed packaging/debian/debiankio/patches/series
changed packaging/debian/debian/changelog
changed packaging/debian/debian/control
changed packaging/debian/debiankio/changelog
changed packaging/debian/debiankio/control
changed packaging/debian/debiankio/rules
changed packaging/debian/buildppa.sh
changed src/common/textsplit.cpp
changed src/doc/user/usermanual.html
changed src/kde/kioslave/kio_recoll-kde4/dirif.cpp
changed src/kde/kioslave/kio_recoll-kde4/htmlif.cpp
changed src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp
changed src/python/recoll/pyrecoll.cpp
changed src/rcldb/rcldb.cpp
changed src/rcldb/termproc.h
changed src/sampleconf/mimeconf
changed src/sampleconf/mimemap
changed src/Makefile.am
changed src/VERSION
changed .hgtags
changed src/windows/mkinstdir.sh
packaging/debian/debian/changelog Diff Switch to side-by-side view
Loading...
packaging/debian/debian/control Diff Switch to side-by-side view
Loading...
packaging/debian/debiankio/changelog Diff Switch to side-by-side view
Loading...
packaging/debian/debiankio/control Diff Switch to side-by-side view
Loading...
packaging/debian/debiankio/rules Diff Switch to side-by-side view
Loading...
packaging/debian/buildppa.sh Diff Switch to side-by-side view
Loading...
src/common/textsplit.cpp Diff Switch to side-by-side view
Loading...
src/doc/user/usermanual.html Diff Switch to side-by-side view
Loading...
src/kde/kioslave/kio_recoll-kde4/dirif.cpp Diff Switch to side-by-side view
Loading...
src/kde/kioslave/kio_recoll-kde4/htmlif.cpp Diff Switch to side-by-side view
Loading...
src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp Diff Switch to side-by-side view
Loading...
src/python/recoll/pyrecoll.cpp Diff Switch to side-by-side view
Loading...
src/rcldb/rcldb.cpp Diff Switch to side-by-side view
Loading...
src/rcldb/termproc.h Diff Switch to side-by-side view
Loading...
src/sampleconf/mimeconf Diff Switch to side-by-side view
Loading...
src/sampleconf/mimemap Diff Switch to side-by-side view
Loading...
src/Makefile.am Diff Switch to side-by-side view
Loading...
src/VERSION Diff Switch to side-by-side view
Loading...
.hgtags Diff Switch to side-by-side view
Loading...
src/windows/mkinstdir.sh Diff Switch to side-by-side view
Loading...