Merge lp://staging/~leonardolemos/pantheon-calculator/fix-1577995 into lp://staging/~elementary-apps/pantheon-calculator/trunk
Proposed by
Leonardo Lemos
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Corentin Noël | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 214 | ||||
| Proposed branch: | lp://staging/~leonardolemos/pantheon-calculator/fix-1577995 | ||||
| Merge into: | lp://staging/~elementary-apps/pantheon-calculator/trunk | ||||
| Diff against target: |
475 lines (+151/-71) 9 files modified
cmake/Translations.cmake (+77/-9) cmake/ValaPrecompile.cmake (+9/-7) cmake/ValaVersion.cmake (+2/-2) data/CMakeLists.txt (+1/-0) data/pantheon-calculator.desktop.in (+3/-4) po/CMakeLists.txt (+2/-0) po/extra/extra.pot (+27/-0) po/pantheon-calculator.pot (+30/-39) src/PantheonCalculator.vala (+0/-10) |
||||
| To merge this branch: | bzr merge lp://staging/~leonardolemos/pantheon-calculator/fix-1577995 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Corentin Noël | Approve | ||
|
Review via email:
|
|||
Commit message
Update CMake modules and fix missing translations
To post a comment you must log in.
Revision history for this message
| Corentin Noël (tintou) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
