Merge lp:~davidgomes/switchboard/file-renaming into lp:~elementary-pantheon/switchboard/switchboard

Proposed by David Gomes
Status: Merged
Merged at revision: 366
Proposed branch: lp:~davidgomes/switchboard/file-renaming
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 27 lines (+5/-5)
1 file modified
CMakeLists.txt (+5/-5)
To merge this branch: bzr merge lp:~davidgomes/switchboard/file-renaming
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+142334@code.launchpad.net

Description of the change

Moved from Switchboard/ to src/ and changed the names of files to make them more "correct" according to other elementary code.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-09-22 12:29:22 +0000
3+++ CMakeLists.txt 2013-01-08 15:24:21 +0000
4@@ -69,11 +69,11 @@
5 ensure_vala_version("0.15.1" MINIMUM)
6 include(ValaPrecompile)
7 vala_precompile(VALA_C
8- Switchboard/switchboard-app.vala
9- Switchboard/switchboard-categoryview.vala
10- Switchboard/switchboard-resources.vala
11- Switchboard/switchboard-desktoplauncher.vala
12- Switchboard/granite-embedded-alert.vala
13+ src/Switchboard.vala
14+ src/CategoryView.vala
15+ src/Resources.vala
16+ src/DesktopLauncher.vala
17+ src/EmbeddedAlert.vala
18 PACKAGES
19 granite
20 gee-1.0
21
22=== renamed directory 'Switchboard' => 'src'
23=== renamed file 'Switchboard/switchboard-categoryview.vala' => 'src/CategoryView.vala'
24=== renamed file 'Switchboard/switchboard-desktoplauncher.vala' => 'src/DesktopLauncher.vala'
25=== renamed file 'Switchboard/granite-embedded-alert.vala' => 'src/EmbeddedAlert.vala'
26=== renamed file 'Switchboard/switchboard-resources.vala' => 'src/Resources.vala'
27=== renamed file 'Switchboard/switchboard-app.vala' => 'src/Switchboard.vala'

Subscribers

People subscribed via source and target branches

to all changes: