• 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
data Loading commit data...
docs Loading commit data...
extensions Loading commit data...
filters Loading commit data...
po Loading commit data...
python Loading commit data...
src Loading commit data...
tests Loading commit data...
utils Loading commit data...
.gitignore Loading commit data...
.svnignore Loading commit data...
AUTHORS Loading commit data...
COPYING Loading commit data...
ChangeLog.pre-0-6-93 Loading commit data...
INSTALL Loading commit data...
MAINTAINERS Loading commit data...
Makefile.am Loading commit data...
Makefile.decl Loading commit data...
NEWS Loading commit data...
README Loading commit data...
TODO Loading commit data...
acinclude.m4 Loading commit data...
autogen.sh Loading commit data...
configure.ac Loading commit data...
gitlog-to-changelog Loading commit data...