~lubuntu-dev/+git/falkon-daily:anmolgautam

Last commit made on 2018-08-12
Get this branch:
git clone -b anmolgautam https://git.launchpad.net/~lubuntu-dev/+git/falkon-daily

Branch merges

Branch information

Name:
anmolgautam
Repository:
lp:~lubuntu-dev/+git/falkon-daily

Recent commits

138397b... by Anmol Gautam <email address hidden>

merged patch D14513

87987e2... by Anmol Gautam <email address hidden>

Merge branch 'arcpatch-D14521' into anmolgautam

40acbff... by Anmol Gautam <email address hidden>

merging patch D14521

6589e6b... by Anmol Gautam <email address hidden>

Added tests for QML Extension API

Reviewers: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14521

dacf993... by Anmol Gautam <email address hidden>

Add QML Extensions API

Reviewers: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14513

16accb7... by Anmol Gautam <email address hidden>

removed unused cmake/config.h.in

d39a16f... by Anmol Gautam <email address hidden>

fix code

45ce836... by Anmol Gautam <email address hidden>

moved qmlPluginLoader to data

87230c4... by Anmol Gautam <email address hidden>

fix code

d1400db... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"