]> git.nothing2do.fr Git - diary-mobile.git/commit
projects / diary-mobile.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7262283 388baaf)
Merge branch 'master' of ssh.alwaysdata.com:git/diary-mobile
authorNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Wed, 28 May 2014 08:30:13 +0000 (10:30 +0200)
committerNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Wed, 28 May 2014 08:30:13 +0000 (10:30 +0200)
commit57e7464cfed245e33ae4d9043a0aa27578c5fc19
tree42f040ee2db37e8196c0ecdc26a0e6d0863426c0tree | snapshot
parent7262283140b1d0a0a5d4e9f33a372786f1e0ccd8commit | diff
parent388baafb8a2a686f467cd1605a7ba5037fb1fe0ccommit | diff
Merge branch 'master' of ssh.alwaysdata.com:git/diary-mobile

Conflicts:
mainwindow.cpp
mainwindow.h
QsKineticScroller.cpp blob1 | blob2 | history
QsKineticScroller.h blob1 | blob2 | history
android/AndroidManifest.xml blob1 | blob2 | history
jean_victor_balin_book.png blob1 | blob2 | history
mainwindow.cpp diff1 | diff2 | blob | history
mainwindow.h diff1 | diff2 | blob | history
mainwindow.ui blob1 | blob2 | history
sax2.cpp blob1 | blob2 | history
sax2.h blob1 | blob2 | history
ui.sql blob1 | blob2 | history
A l'origine, devait m'aider à soulager ma mémoire défaillante. Sauf que j'ai rajouté des fonctions qui dépasse ce cadre (les commandes shell principalement).