| author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
| commit | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (unidiff) | |
| tree | 42fe98603849248c0d3943fd1d79135a734811c9 /frontend/gamma | |
| parent | 25029b943781850c76fbf43827af0204f35a98bf (diff) | |
| parent | d791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff) | |
| download | clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.zip clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.gz clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.bz2 | |
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts:
frontend/gamma/properties/gamma.properties.json
| -rw-r--r-- | frontend/gamma/properties/gamma.properties.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json index 0a513e8..c847812 100644 --- a/frontend/gamma/properties/gamma.properties.json +++ b/frontend/gamma/properties/gamma.properties.json | |||
| @@ -159,33 +159,33 @@ | |||
| 159 | "Clipperz/PM/UI/Web/Components/AccountPanel.js", | 159 | "Clipperz/PM/UI/Web/Components/AccountPanel.js", |
| 160 | "Clipperz/PM/UI/Web/Components/DataPanel.js", | 160 | "Clipperz/PM/UI/Web/Components/DataPanel.js", |
| 161 | "Clipperz/PM/UI/Web/Components/ToolsPanel.js", | 161 | "Clipperz/PM/UI/Web/Components/ToolsPanel.js", |
| 162 | "Clipperz/PM/UI/Web/Components/RulerComponent.js", | 162 | "Clipperz/PM/UI/Web/Components/RulerComponent.js", |
| 163 | "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", | 163 | "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", |
| 164 | "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", | 164 | "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", |
| 165 | "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", | 165 | "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", |
| 166 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", | 166 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", |
| 167 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", | 167 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", |
| 168 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", | 168 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", |
| 169 | "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", | 169 | "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", |
| 170 | "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", | 170 | "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", |
| 171 | "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", | 171 | "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", |
| 172 | "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", | 172 | "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", |
| 173 | 173 | ||
| 174 | "Clipperz/PM/UI/Web/Controllers/MainController.js", | 174 | "Clipperz/PM/UI/Web/Controllers/MainController.js", |
| 175 | "Clipperz/PM/UI/Web/Controllers/LoginController.js", | 175 | "Clipperz/PM/UI/Web/Controllers/LoginController.js", |
| 176 | "Clipperz/PM/UI/Web/Controllers/AppController.js", | 176 | "Clipperz/PM/UI/Web/Controllers/AppController.js", |
| 177 | "Clipperz/PM/UI/Web/Controllers/FilterController.js", | 177 | "Clipperz/PM/UI/Web/Controllers/FilterController.js", |
| 178 | "Clipperz/PM/UI/Web/Controllers/GridController.js", | 178 | "Clipperz/PM/UI/Web/Controllers/GridController.js", |
| 179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", | 179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", |
| 180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", | 180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", |
| 181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", | 181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", |
| 182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", | 182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", |
| 183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", | 183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", |
| 184 | 184 | ||
| 185 | "main.js" | 185 | "main.js" |
| 186 | ], | 186 | ], |
| 187 | 187 | ||
| 188 | "css": [ | 188 | "css": [ |
| 189 | "web.css" | 189 | "web.css" |
| 190 | ] | 190 | ] |
| 191 | } \ No newline at end of file | 191 | } |