Merge lp://staging/~l-admin-3/eidete/fix-for-fix-for-freya into lp://staging/eidete
Proposed by
Marcus Wichelmann
Status: | Merged |
---|---|
Merged at revision: | 178 |
Proposed branch: | lp://staging/~l-admin-3/eidete/fix-for-fix-for-freya |
Merge into: | lp://staging/eidete |
Diff against target: |
2978 lines (+1206/-941) 9 files modified
src/Config.vala.cmake (+7/-7) src/Widgets/countdown.vala (+30/-31) src/Widgets/end_dialog.vala (+231/-170) src/Widgets/keyview.vala (+433/-307) src/Widgets/selectionarea.vala (+65/-63) src/desktop_launcher.vala (+3/-4) src/eidete.vala (+317/-260) src/keycapture.c (+33/-29) src/videobin_uploader.vala (+87/-70) |
To merge this branch: | bzr merge lp://staging/~l-admin-3/eidete/fix-for-fix-for-freya |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Beckmann | Pending | ||
Review via email:
|
Description of the change
I've corrected the style of the whole code and maked it more consistent.
To post a comment you must log in.
Might as well remove all the "using Gtk;", "using Granite;" while you're at it.