diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-23 13:26:42 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-23 13:26:42 +0200 |
| commit | 1ee847c0dd56fcfbe2d93d64120789083c7a5bcf (patch) | |
| tree | 36c1f524f28e92a56266f452f115ecdd3173fbc0 /doc/installerfw.qdoc | |
| parent | d7f58f9f589c7de1a34e73ab4fda48a06a6b4ee4 (diff) | |
| parent | bbd2cab7c4097a0776c28a5e1d4cc2f8b66b53c1 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
src/libs/installer/lib7z_facade.h
Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
Diffstat (limited to 'doc/installerfw.qdoc')
| -rw-r--r-- | doc/installerfw.qdoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index fb2015047..202d642b4 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -802,6 +802,9 @@ \list \o URL, which points to a list of available components. + \o Enabled, with 0 disabling this repository. + \o Username, which is used as user on a protected repository. + \o Password, which sets the password to use on a protected repository. \endlist |