Viewing all changes in revision 60.
- Committer: Dominique Lasserre
- Date: 2012-04-07 22:39:23 UTC
- mfrom: (56.1.1)
- Revision ID: git-v1:9cddbef952eff995a11f57e2dc582d6686a22440
Merge branch 'lseelinger'
Conflicts:
libtool
src/chimaira.c
src/dbmanager.c
src/directoryMonitor.c
src/libchimaira.c
src/vSqlite.c
Conflicts:
libtool
src/chimaira.c
src/dbmanager.c
src/directoryMonitor.c
src/libchimaira.c
src/vSqlite.c
- files modified:
- src/dbmanager.vala
expand all
collapse all
added
removed
