Merge lp:~dholbach/help-app/1434125 into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Proposed by
Daniel Holbach
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~dholbach/help-app/1434125 | ||||
Merge into: | lp:~ubuntu-touch-coreapps-drivers/help-app/trunk | ||||
Prerequisite: | lp:~dholbach/help-app/1429896 | ||||
Diff against target: |
212 lines (+54/-27) 4 files modified
HACKING (+5/-0) Makefile (+7/-1) internals/web-publish (+19/-0) po/de.po (+23/-26) |
||||
To merge this branch: | bzr merge lp:~dholbach/help-app/1434125 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Planella | Needs Fixing | ||
Review via email:
|
This proposal has been superseded by a proposal from 2015-03-20.
To post a comment you must log in.
Unmerged revisions
- 131. By Daniel Holbach
-
fix logic to obtain OUTPUTDIR_WEB value from Makefile
- 130. By Daniel Holbach
-
we need bzrtools, thanks Nick!
- 129. By Daniel Holbach
-
update .po files
- 128. By Daniel Holbach
-
merge from trunk
- 127. By Daniel Holbach
-
use trap (http://
redsymbol. net/articles/ bash-exit- traps/), thanks mvo! don't test rc of 'bzr commit', we use 'set -e' already - 126. By Daniel Holbach
-
update docs
- 125. By Daniel Holbach
-
merge from trunk
- 124. By Daniel Holbach
-
update branch location (~help-app-dev), get OUTPUTDIR_WEB from Makefile, add revno to commit message, quote properly, fix test for retcode
- 123. By Daniel Holbach
-
translation change for testing
- 122. By Daniel Holbach
-
Require 'web' target to be executed before 'web-publish'. Make it possible to print out Makefile variables to use elsewhere
Thanks! Added inline comments.