mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2016-03-31 21:57:12 -05:00
commit 2efa047999
17 changed files with 436 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mobilecomponents.sh
View file

@ -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