1. 03 Sep, 2009 2 commits
    • 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
    • Jürg Billeter's avatar
  2. 02 Sep, 2009 7 commits
  3. 01 Sep, 2009 21 commits
  4. 31 Aug, 2009 10 commits