#!/bin/sh # Do not warn if there were no real merge git rev-parse -q --verify HEAD^2 >/dev/null || exit echo echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "! You probably used 'git pull' instead of 'git pull -r' !" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo echo "You can still fix it - please do 'git pull -r' now." echo ons Git repository'/>
aboutsummaryrefslogtreecommitdiff
path: root/source/sw-TZ/scp2
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-12-03 14:23:40 +0100
committerAndras Timar <atimar@suse.com>2012-12-03 14:23:40 +0100
commit9e3b72859ec7871fdb2884860b54fd2a8de30f3d (patch)
treeffb0efcd5efe600a13dddbc70e9b9328d2681f81 /source/sw-TZ/scp2
parent965f3562a25b75fc3401d3b44ed96e2e5093ed72 (diff)
update translations for LibreOffice 4.0 beta1
Change-Id: I35e0bf7dfef1541f76508edb962e89bc5d78e339
Diffstat (limited to 'source/sw-TZ/scp2')