mate-desktop: merge f18 changes into f19

This commit is contained in:
Jens Petersen 2012-10-18 17:09:04 +09:00
parent ee5d7cc676
commit f0c597ad25
2 changed files with 15 additions and 3 deletions

View File

@ -4245,6 +4245,9 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <packagelist>
<packagereq>abrt-desktop</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>desktop-backgrounds-compat</packagereq>
<packagereq>mate-corba</packagereq> <packagereq>mate-corba</packagereq>
<packagereq>libmatewnck</packagereq> <packagereq>libmatewnck</packagereq>
<packagereq>mate-conf</packagereq> <packagereq>mate-conf</packagereq>
@ -4272,16 +4275,25 @@
<packagereq>mate-control-center</packagereq> <packagereq>mate-control-center</packagereq>
<packagereq>mate-panel</packagereq> <packagereq>mate-panel</packagereq>
<packagereq>mate-session-manager</packagereq> <packagereq>mate-session-manager</packagereq>
<packagereq>mate-terminal</packagereq>
<packagereq>mate-text-editor</packagereq>
<packagereq>mate-themes</packagereq>
<packagereq>mate-conf-editor</packagereq>
<packagereq>firstboot</packagereq> <packagereq>firstboot</packagereq>
<packagereq>network-manager-applet</packagereq> <packagereq>network-manager-applet</packagereq>
<packagereq>nm-connection-editor</packagereq> <packagereq>nm-connection-editor</packagereq>
<packagereq>firewall-config</packagereq> <packagereq>firewall-config</packagereq>
<packagereq>fedora-icon-theme</packagereq>
<packagereq>lightdm-gtk</packagereq> <packagereq>lightdm-gtk</packagereq>
<packagereq>xscreensaver-base</packagereq>
<packagereq>yumex</packagereq>
<packagereq>ConsoleKit-x11</packagereq>
<packagereq>NetworkManager-openconnect</packagereq> <packagereq>NetworkManager-openconnect</packagereq>
<packagereq>NetworkManager-openvpn</packagereq> <packagereq>NetworkManager-openvpn</packagereq>
<packagereq>NetworkManager-pptp</packagereq> <packagereq>NetworkManager-pptp</packagereq>
<packagereq>NetworkManager-vpnc</packagereq> <packagereq>NetworkManager-vpnc</packagereq>
<packagereq>firefox</packagereq>
<packagereq>xterm</packagereq>
<packagereq>imsettings</packagereq>
</packagelist> </packagelist>
</group> </group>
<group> <group>