You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2016/01/28 15:53:15 UTC
[11/12] cordova-ubuntu git commit: Merge remote-tracking branch
'ubuntu/master'
Merge remote-tracking branch 'ubuntu/master'
Conflicts:
CordovaUbuntu/CordovaViewInternal.qml
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/4af7668b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/4af7668b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/4af7668b
Branch: refs/heads/master
Commit: 4af7668b5f7f400bace566f48f81ab446bcd4e01
Parents: 1ecfc4f 9509e62
Author: David Barth <da...@canonical.com>
Authored: Thu Jan 28 12:24:58 2016 +0100
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:24:58 2016 +0100
----------------------------------------------------------------------
CordovaUbuntu/CordovaViewInternal.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org