]> git.nothing2do.fr Git - diary-shell.git/commit
Merge branch 'master' of https://github.com/Nothing2Do/diary-shell
authorNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Fri, 5 Jul 2013 11:33:10 +0000 (13:33 +0200)
committerNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Fri, 5 Jul 2013 11:33:10 +0000 (13:33 +0200)
commite1150ce8ef285bbbb031c72e5decfd8a54dbe9c1
treedc894a65f477a399631f14b79fa977e1a28654cc
parent8987ff78182d4583f38138fb365c1a8993369705
parent81cc79e26b8fed54a642c528fd5a6dfe640fcb4b
Merge branch 'master' of https://github.com/Nothing2Do/diary-shell

Conflicts:
alias.sql

unknown
alias.sql
sqldb.cpp