| author | mickeyl <mickeyl> | 2003-09-20 13:40:42 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-09-20 13:40:42 (UTC) |
| commit | acc378572323b79993eb535a9d596ad1fbc8ff9f (patch) (unidiff) | |
| tree | a657cdc6a93b8234db864ad52bba190a7177fdcc /core/settings | |
| parent | af02302ec3615007e34cedfb8d91dd3a55832fbb (diff) | |
| download | opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.zip opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.gz opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.bz2 | |
merge control files with BRANCH
5 files changed, 5 insertions, 5 deletions
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control index 34dc7e0..93b084c 100644 --- a/core/settings/button/opie-button-settings.control +++ b/core/settings/button/opie-button-settings.control | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | Package: opie-button-settings | 1 | Package: opie-button-settings |
| 2 | Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png | 2 | Files: plugins/application/libbuttonsettings.so* bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/settings | 4 | Section: opie/settings |
| 5 | Maintainer: Robert Griebl <sandman@handhelds.org> | 5 | Maintainer: Robert Griebl <sandman@handhelds.org> |
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control index 5b0c8da..5f3f33c 100644 --- a/core/settings/citytime/opie-citytime.control +++ b/core/settings/citytime/opie-citytime.control | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | Package: opie-citytime | 1 | Package: opie-citytime |
| 2 | Files: bin/citytime apps/Settings/citytime.desktop pics/citytime | 2 | Files: plugins/application/libcitytime.so* bin/citytime apps/Settings/citytime.desktop pics/citytime |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/settings | 4 | Section: opie/settings |
| 5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | 5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> |
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control index 0e7832d..58596e8 100644 --- a/core/settings/launcher/opie-launcher-settings.control +++ b/core/settings/launcher/opie-launcher-settings.control | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | Package: opie-launcher-settings | 1 | Package: opie-launcher-settings |
| 2 | Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings | 2 | Files: plugins/application/liblaunchersettings.so* bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/settings | 4 | Section: opie/settings |
| 5 | Maintainer: Robert Griebl <sandman@handhelds.org> | 5 | Maintainer: Robert Griebl <sandman@handhelds.org> |
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control index da6fc4f..eaa47f3 100644 --- a/core/settings/light-and-power/opie-light-and-power.control +++ b/core/settings/light-and-power/opie-light-and-power.control | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | Package: opie-light-and-power | 1 | Package: opie-light-and-power |
| 2 | Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower | 2 | Files: plugins/application/liblight-and-power.so* bin/light-and-power apps/Settings/Light.desktop pics/lightandpower |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/settings | 4 | Section: opie/settings |
| 5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | 5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> |
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control index 0da6f0f..6059e90 100644 --- a/core/settings/security/opie-security.control +++ b/core/settings/security/opie-security.control | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | Package: opie-security | 1 | Package: opie-security |
| 2 | Files: bin/security apps/Settings/Security.desktop pics/security | 2 | Files: plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/settings | 4 | Section: opie/settings |
| 5 | Maintainer: Warwick Allison <warwick@trolltech.com> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |