• Carlos Garnacho's avatar
    Merge branch 'master' into libtracker-miner · 087c55a8
    Carlos Garnacho authored
    Conflicts:
    	data/dbus/org.freedesktop.Tracker.Miner.Files.service.in
    	data/dbus/tracker-miner.xml
    	src/Makefile.am
    	src/libtracker-common/Makefile.am
    	src/libtracker-common/tracker-module-config.c
    	src/libtracker-common/tracker-module-config.h
    	src/tracker-miner-fs/Makefile.am
    	src/tracker-miner-fs/modules/evolution-imap.c
    	src/tracker-miner-fs/modules/evolution-pop.c
    	src/tracker-miner-fs/tracker-crawler.c
    	src/tracker-miner-fs/tracker-indexer.c
    	src/tracker-miner-fs/tracker-main.c
    	src/tracker-miner-fs/tracker-miner-applications.c
    	src/tracker-miner-fs/tracker-miner.h
    	src/tracker-utils/tracker-status.c
    087c55a8
org.freedesktop.Tracker.Miner.Files.service.in 93 Bytes