]> gitweb.hamatoma.de Git - reqt/commit
Merge branch 'master' of git@f-r-e-i.de:/home/git/repo/rplqt
authorhama <hama@siduction.net>
Fri, 1 May 2015 23:14:00 +0000 (01:14 +0200)
committerhama <hama@siduction.net>
Fri, 1 May 2015 23:14:00 +0000 (01:14 +0200)
commit5719b75c28c8845a4da4a47c2d20d68823985f0e
tree4ead56fb17d6cc203986ae1db6ed0cc7a3a5df67
parent27b1c0bc91cf539906181cfd3c5921c04bea1167
parent123a626c675a3d32d25e554caaef1a406dd93197
Merge branch 'master' of git@f-r-e-i.de:/home/git/repo/rplqt

Conflicts:
appl/refind/mainwindow.cpp
appl/refind/refind.pro
appl/refind/mainwindow.cpp