Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------src/3rdparty/qtkeychain0
-rw-r--r--src/gui/protocolwidget.ui2
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index ba3b7388b..2b1e9744c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
[submodule "src/3rdparty/libcrashreporter-qt"]
path = src/3rdparty/libcrashreporter-qt
url = git://github.com/dschmidt/libcrashreporter-qt.git
+[submodule "src/3rdparty/qtkeychain"]
+ path = src/3rdparty/qtkeychain
+ url = https://github.com/frankosterfeld/qtkeychain.git
diff --git a/src/3rdparty/qtkeychain b/src/3rdparty/qtkeychain
new file mode 160000
+Subproject 08be0593e100a041585bcc704a1bbc5a812a168
diff --git a/src/gui/protocolwidget.ui b/src/gui/protocolwidget.ui
index 1569a89f8..247604308 100644
--- a/src/gui/protocolwidget.ui
+++ b/src/gui/protocolwidget.ui
@@ -57,7 +57,7 @@
</column>
</widget>
</item>
- <item row="2" column="1">
+ <item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="_dialogButtonBox"/>
</item>
</layout>