Merge with trunk
Showing
- autopackage/default.apspec 22 additions, 16 deletionsautopackage/default.apspec
- data/emoticons/Makefile.am 10 additions, 10 deletionsdata/emoticons/Makefile.am
- data/glade/account_creation_wizard_window.glade 820 additions, 1239 deletionsdata/glade/account_creation_wizard_window.glade
- data/glade/account_modification_window.glade 129 additions, 66 deletionsdata/glade/account_modification_window.glade
- data/glade/advanced_menuitem_menu.glade 24 additions, 3 deletionsdata/glade/advanced_menuitem_menu.glade
- data/glade/blocked_contacts_window.glade 147 additions, 0 deletionsdata/glade/blocked_contacts_window.glade
- data/glade/chat_control_popup_menu.glade 3 additions, 3 deletionsdata/glade/chat_control_popup_menu.glade
- data/glade/data_form_window.glade 1 addition, 1 deletiondata/glade/data_form_window.glade
- data/glade/gc_control_popup_menu.glade 129 additions, 131 deletionsdata/glade/gc_control_popup_menu.glade
- data/glade/gc_occupants_menu.glade 130 additions, 161 deletionsdata/glade/gc_occupants_menu.glade
- data/glade/history_window.glade 19 additions, 0 deletionsdata/glade/history_window.glade
- data/glade/message_window.glade 1 addition, 1 deletiondata/glade/message_window.glade
- data/glade/roster_contact_context_menu.glade 329 additions, 339 deletionsdata/glade/roster_contact_context_menu.glade
- data/glade/search_window.glade 191 additions, 0 deletionsdata/glade/search_window.glade
- data/glade/service_registration_window.glade 3 additions, 25 deletionsdata/glade/service_registration_window.glade
- data/glade/synchronise_select_account_dialog.glade 131 additions, 0 deletionsdata/glade/synchronise_select_account_dialog.glade
- data/glade/synchronise_select_contacts_dialog.glade 131 additions, 0 deletionsdata/glade/synchronise_select_contacts_dialog.glade
- data/glade/vcard_information_window.glade 111 additions, 21 deletionsdata/glade/vcard_information_window.glade
- data/iconsets/Makefile.am 10 additions, 10 deletionsdata/iconsets/Makefile.am
- data/iconsets/transports/icq/16x16/away.png 0 additions, 0 deletionsdata/iconsets/transports/icq/16x16/away.png
Loading
Please register or sign in to comment