• 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
Name
Last commit
Last update
..
db Loading commit data...
dbus Loading commit data...
icons Loading commit data...
languages Loading commit data...
ontologies Loading commit data...
.gitignore Loading commit data...
Makefile.am Loading commit data...
libtracker-gtk.pc.in Loading commit data...
tracker-miner-fs.desktop.in.in Loading commit data...
tracker-module.pc.in Loading commit data...
tracker-stop-words.txt Loading commit data...
tracker-store.desktop.in.in Loading commit data...
tracker.pc.in Loading commit data...
tracker.spec Loading commit data...