Re: [Kimchi-devel] [wok 0/2] Fix recent merge

Lucio, please, confirm if the changes were not applied.

Thanks, Aline Manera On 08/09/2015 17:00, Lucio Correia wrote: > For some reason, commits 01 and 02 from "[wok V3 0/6] Make wok branch > identical to wok V3" were not entirely merged. This patchset fixes that. > > Lucio Correia (2): > Fix merge of patch 01 > Fix merge of patch 02 > > plugins/kimchi/ui/images/theme-default/alert.png | Bin 3537 -> 0 > bytes > .../kimchi/ui/images/theme-default/check-green.png | Bin 3501 -> 0 > bytes > .../kimchi/ui/images/theme-default/check-grey.png | Bin 3535 -> 0 > bytes > .../ui/images/theme-default/folder-arrow-right.png | Bin 2958 -> 0 > bytes > .../kimchi/ui/images/theme-default/icon-alert.png | Bin 3545 -> 0 > bytes > .../kimchi/ui/images/theme-default/icon-event.png | Bin 3791 -> 0 > bytes > .../ui/images/theme-default/icon-setting.png | Bin 3664 -> 0 > bytes > .../kimchi/ui/images/theme-default/icon-tool.png | Bin 4466 -> 0 > bytes > .../ui/images/theme-default/kimchi-loading.gif | Bin 6181 -> 0 > bytes > .../kimchi/ui/images/theme-default/thumb-guest.png | Bin 3896 -> 0 > bytes > .../kimchi/ui/images/theme-default/thumb-host.png | Bin 5069 -> 0 > bytes > .../base/images/ui-bg_glass_65_ffffff_1x400.png | Bin 246 -> 0 > bytes > .../themes/base/images/ui-icons_222222_256x240.png | Bin 7006 -> 0 > bytes > ui/images/theme-default/alert.png | Bin 0 -> 3537 > bytes > ui/images/theme-default/check-green.png | Bin 0 -> 3501 > bytes > ui/images/theme-default/check-grey.png | Bin 0 -> 3535 > bytes > ui/images/theme-default/folder-arrow-right.png | Bin 0 -> 2958 > bytes > ui/images/theme-default/icon-alert.png | Bin 0 -> 3545 > bytes > ui/images/theme-default/icon-event.png | Bin 0 -> 3791 > bytes > ui/images/theme-default/icon-setting.png | Bin 0 -> 3664 > bytes > ui/images/theme-default/icon-tool.png | Bin 0 -> 4466 > bytes > ui/images/theme-default/thumb-guest.png | Bin 0 -> 3896 > bytes > ui/images/theme-default/thumb-host.png | Bin 0 -> 5069 > bytes > ui/images/theme-default/wok-loading.gif | Bin 0 -> 6181 > bytes > .../base/images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 246 > bytes > .../themes/base/images/ui-icons_222222_256x240.png | Bin 0 -> 7006 > bytes > 26 files changed, 0 insertions(+), 0 deletions(-) > delete mode 100644 plugins/kimchi/ui/images/theme-default/alert.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/check-green.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/check-grey.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/folder-arrow-right.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/icon-alert.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/icon-event.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/icon-setting.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/icon-tool.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/kimchi-loading.gif > delete mode 100644 > plugins/kimchi/ui/images/theme-default/thumb-guest.png > delete mode 100644 > plugins/kimchi/ui/images/theme-default/thumb-host.png > delete mode 100644 > plugins/kimchi/ui/libs/themes/base/images/ui-bg_glass_65_ffffff_1x400.png > delete mode 100644 > plugins/kimchi/ui/libs/themes/base/images/ui-icons_222222_256x240.png > create mode 100644 ui/images/theme-default/alert.png > create mode 100644 ui/images/theme-default/check-green.png > create mode 100644 ui/images/theme-default/check-grey.png > create mode 100644 ui/images/theme-default/folder-arrow-right.png > create mode 100644 ui/images/theme-default/icon-alert.png > create mode 100644 ui/images/theme-default/icon-event.png > create mode 100644 ui/images/theme-default/icon-setting.png > create mode 100644 ui/images/theme-default/icon-tool.png > create mode 100644 ui/images/theme-default/thumb-guest.png > create mode 100644 ui/images/theme-default/thumb-host.png > create mode 100644 ui/images/theme-default/wok-loading.gif > create mode 100644 > ui/libs/themes/base/images/ui-bg_glass_65_ffffff_1x400.png > create mode 100644 > ui/libs/themes/base/images/ui-icons_222222_256x240.png > _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel