Changeset 1162 for trunk/LATMOS-Accounts-Web/MANIFEST

Timestamp:

09/28/12 08:08:47 (12 years ago)

Author:

nanardon

Message:

fix conflict

File:

• trunk/LATMOS-Accounts-Web/MANIFEST (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/MANIFEST

@@ -124 +124 @@
 root/html/users/passwd.tt
 root/html/users/side_menu.tt
-root/static/icons/add.png
-root/static/icons/appointment-new.png
 root/static/icons/appointment-soon.png
 root/static/icons/arrow-right.png
-root/static/icons/avatar-default.png
-root/static/icons/changes-prevent.png
 root/static/icons/dialog-cancel.png
 root/static/icons/dialog-password.png
 root/static/icons/document-save-as.png
 root/static/icons/document-save.png
-root/static/icons/editclear.png
-root/static/icons/emblem-default.png
-root/static/icons/emblem-favorite.png
-root/static/icons/emblem-urgent.png
 root/static/icons/expired.png
-root/static/icons/find.png
 root/static/icons/gnome-session-logout.png
 root/static/icons/gnome-stock-mail-snd.png
 root/static/icons/gtk-about.png
-root/static/icons/gtk-add.png
 root/static/icons/gtk-cancel.png
 root/static/icons/gtk-close.png
-root/static/icons/gtk-delete.png
 root/static/icons/gtk-execute.png
-root/static/icons/gtk-find.png
-root/static/icons/gtk-go-back-ltr.png
-root/static/icons/gtk-go-back-rtl.png
-root/static/icons/gtk-goto-first-ltr.png
-root/static/icons/gtk-goto-first-rtl.png
-root/static/icons/gtk-home.png
-root/static/icons/gtk-jump-to-rtl.png
 root/static/icons/gtk-refresh.png
 root/static/icons/help-contents.png
@@ -167 +149 @@
 root/static/icons/stock_smiley-22.png
 root/static/icons/system-config-users.png
-root/static/icons/system-users.png
-root/static/icons/user-group-delete.png
-root/static/icons/user-group-new.png
-root/static/icons/user-group-properties.png
 root/static/icons/user-info.png
 root/static/icons/user-invisible.png
-root/static/icons/user-properties.png
-root/static/icons/user-trash.png
-root/static/icons/video-display.png
 root/static/icons/view-calendar-day.png
 root/static/icons/view-media-artist.png
-root/static/icons/xfce-internet.png
+root/static/images/add.png
+root/static/images/appointment-new.png
+root/static/images/avatar-default.png
 root/static/images/btn_120x50_built.png
 root/static/images/btn_120x50_built_shadow.png
@@ -188 +165 @@
 root/static/images/btn_88x31_powered_shadow.png
 root/static/images/catalyst_logo.png
+root/static/images/changes-prevent.png
 root/static/images/contact-new.png
 root/static/images/dialog-cancel.png
 root/static/images/dialog-ok-apply.png
 root/static/images/edit-delete.png
+root/static/images/edit-disable.png
+root/static/images/edit-enable.png
+root/static/images/editclear.png
+root/static/images/emblem-default.png
+root/static/images/emblem-favorite.png
+root/static/images/emblem-urgent.png
+root/static/images/find.png
+root/static/images/group_conf.png
+root/static/images/group_del.png
+root/static/images/gtk-add.png
+root/static/images/gtk-delete.png
+root/static/images/gtk-find.png
+root/static/images/gtk-go-back-ltr.png
+root/static/images/gtk-go-back-rtl.png
+root/static/images/gtk-goto-first-ltr.png
+root/static/images/gtk-goto-first-rtl.png
+root/static/images/gtk-home.png
+root/static/images/gtk-jump-to-rtl.png
+root/static/images/icon_edit.png
+root/static/images/locked.png
+root/static/images/logviewer.png
 root/static/images/mail-mark-important.png
 root/static/images/mail-mark-junk.png
 root/static/images/mail-mark-unread-new.png
 root/static/images/mail-mark-unread.png
+root/static/images/mail-read.png
+root/static/images/mail_forward.png
+root/static/images/network-workgroup.png
+root/static/images/preferences-desktop-wallpaper.png
 root/static/images/process-stop.png
+root/static/images/site_conf.png
+root/static/images/system-users.png
+root/static/images/user-trash.png
+root/static/images/video-display.png
 root/static/images/view-media-artist.png
 root/static/images/view-pim-contacts.png