diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-31 21:57:12 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-31 22:36:15 -0500 |
| commit | 2efa047999c5e82bb05215648bbe8248fd0b03e6 (patch) | |
| tree | f231e16e7d770805af58359f5476064a72ec034a /scripts | |
| parent | 2069526e74505e873140f7be35871db7acbc084d (diff) | |
| parent | 2480f21e5b2463bd5ac82980f44386277f24c51f (diff) | |
| download | subsurface-2efa047999c5e82bb05215648bbe8248fd0b03e6.tar.gz | |
Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort
This merge was a bit more challenging given how far things had diverged,
but I hope I got it mostly right.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mobilecomponents.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 0ead42258..ac3d1c1c4 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -14,7 +14,7 @@ if [ ! -d "$SRC/subsurface" ] || [ ! -d "qt-mobile" ] || [ ! -d "subsurface-core exit 1 fi -# now bring in the latest Plasma-mobile mobile components plus a couple of icons that we need +# now bring in the latest Kirigami mobile components plus a couple of icons that we need # first, get the latest from upstream # yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way # we stop having to manually merge our code with upstream all the time @@ -22,7 +22,7 @@ fi # or SHAs from upstream cd $SRC if [ ! -d kirigami ] ; then - git clone git://anongit.kde.org/kirigami.git + git clone git://github.com/KDE/kirigami fi pushd kirigami git pull |