← Back to branch summary

~kvalo/indicator-network/bug-739312

~kvalo/indicator-network/bug-739312

Viewing all changes in revision 159.

Committer: Kalle Valo
Date: 2011-03-08 17:46:05 UTC
mfrom: (158.1.4 settings-more-tech)
Revision ID: kalle.valo@canonical.com-20110308174605-5aedkmoityta4yo2

Merge lp:~kvalo/indicator-network/settings-more-tech

files added:
src/settings/ui/bluetooth_box.ui

src/settings/ui/mobile_box.ui

src/settings/ui/wired_box.ui

files renamed:
src/settings/ui/mobile_box.ui => src/settings/ui/edit_apn.ui

files modified:
src/settings/frontend/widgets/device-boxes/bluetooth.vala

src/settings/frontend/widgets/device-boxes/mobile.vala

src/settings/frontend/widgets/device-boxes/wired.vala

src/settings/ui/Makefile.am

src/settings/ui/main.ui

Show diffs side-by-side

added added

removed removed

src/settings/frontend/widgets/device-boxes/bluetooth.vala

src/settings/frontend/widgets/device-boxes/mobile.vala

src/settings/frontend/widgets/device-boxes/wired.vala

src/settings/ui/Makefile.am

src/settings/ui/bluetooth_box.ui

src/settings/ui/main.ui

src/settings/ui/mobile_box.ui

src/settings/ui/wired_box.ui

Older »