← Back to branch summary

~elementary-os/elementaryos/os-patch-unity-control-center-xenial

~elementary-os/elementaryos/os-patch-unity-control-center-xenial

Viewing all changes in revision 7.

Committer: Cody Garver
Date: 2016-03-16 23:53:02 UTC
mfrom: (1.1.4 unity-control-center-xenial)
Revision ID: cody@elementary.io-20160316235302-5mt0sib78xa4u31e

Merge in lp:~elementary-os/ubuntu-package-imports/unity-control-center-xenial and resolve conflicts

files added:
panels/sound/data/icons/256x256

panels/sound/data/icons/256x256/Makefile.am

panels/sound/data/icons/256x256/apps

panels/sound/data/icons/256x256/apps/Makefile.am

panels/sound/data/icons/256x256/apps/unity-sound-panel.png

files modified:
configure.ac

debian/changelog

debian/control

panels/appearance/appearance.ui

panels/appearance/cc-appearance-panel.c

panels/bluetooth/cc-bluetooth-panel.c

panels/color/cc-color-panel.c

panels/display/cc-display-panel.c

panels/info/cc-info-panel.c

panels/info/searchingthedashlegalnotice.html

panels/keyboard/cc-keyboard-panel.c

panels/mouse/cc-mouse-panel.c

panels/network/cc-network-panel.c

panels/power/cc-power-panel.c

panels/printers/cc-printers-panel.c

panels/region/cc-region-panel.c

panels/screen/cc-screen-panel.c

panels/screen/screen.ui

panels/sound/data/icons/Makefile.am

panels/universal-access/cc-ua-panel.c

panels/universal-access/uap.ui

panels/user-accounts/um-password-dialog.c

panels/user-accounts/um-user-panel.c

panels/wacom/cc-wacom-panel.c

shell/control-center.c

shell/gnome-control-center.c

Show diffs side-by-side

added added

removed removed

debian/changelog

panels/appearance/appearance.ui

panels/appearance/cc-appearance-panel.c

panels/bluetooth/cc-bluetooth-panel.c

panels/color/cc-color-panel.c

panels/display/cc-display-panel.c

panels/info/cc-info-panel.c

panels/info/searchingthedashlegalnotice.html

panels/keyboard/cc-keyboard-panel.c

panels/mouse/cc-mouse-panel.c

panels/network/cc-network-panel.c

panels/power/cc-power-panel.c

panels/printers/cc-printers-panel.c

panels/region/cc-region-panel.c

panels/screen/cc-screen-panel.c

panels/screen/screen.ui

panels/sound/data/icons/256x256/

panels/sound/data/icons/256x256/Makefile.am

panels/sound/data/icons/256x256/apps/

panels/sound/data/icons/256x256/apps/Makefile.am

panels/sound/data/icons/256x256/apps/unity-sound-panel.png

panels/sound/data/icons/Makefile.am

panels/universal-access/cc-ua-panel.c

panels/universal-access/uap.ui

panels/user-accounts/um-password-dialog.c

panels/user-accounts/um-user-panel.c

panels/wacom/cc-wacom-panel.c

shell/control-center.c

shell/gnome-control-center.c

Older »