]> git.nothing2do.fr Git - diary-mobile.git/commit
Merge branch 'master' of ssh.alwaysdata.com:git/diary-mobile
authorNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Sat, 24 May 2014 07:41:16 +0000 (09:41 +0200)
committerNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Sat, 24 May 2014 07:41:16 +0000 (09:41 +0200)
commit854fac7333060fbf5680b57e4c4d69f4dda56fca
tree68086ab9b529fba172729d66de531ef67eec7f97
parentc497b3acff0f7aec8235366e99c2fe153502087d
parent7811a34fae5d6135431ec6514a3ebdafa182b887
Merge branch 'master' of ssh.alwaysdata.com:git/diary-mobile

Conflicts:
mainwindow.cpp

merge ?