]> git.nothing2do.fr Git - diary-mobile.git/commit
Merge branch 'master' of ssh.alwaysdata.com:www/diary-mobile-android
authorNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Mon, 28 Apr 2014 14:15:18 +0000 (16:15 +0200)
committerNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Mon, 28 Apr 2014 14:15:18 +0000 (16:15 +0200)
commit2473f3bdb8551860c267f313956e923cd19a0c7a
treed5d56bd753ec7b332fe0e7dfe8d3c67478cda596
parentaafee49d1024d1299576e3d63d7b284dd96e3612
parent241142aefeb24136996d7b7f3ea2a3473b9b2d3d
Merge branch 'master' of ssh.alwaysdata.com:www/diary-mobile-android

Conflicts:
mainwindow.cpp