Merge lp:~michihenning/nux/937583 into lp:nux
Proposed by
Michi Henning
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michi Henning | ||||
Approved revision: | 679 | ||||
Merged at revision: | 679 | ||||
Proposed branch: | lp:~michihenning/nux/937583 | ||||
Merge into: | lp:nux | ||||
Diff against target: |
28 lines (+2/-6) 2 files modified
NuxCore/PropertyTraits.h (+1/-5) configure.ac (+1/-1) |
||||
To merge this branch: | bzr merge lp:~michihenning/nux/937583 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michi Henning (community) | Approve | ||
Review via email: mp+127406@code.launchpad.net |
Commit message
Fixed catch clause and removed #ifdef because it can be the same for Windows and Linux.
Removed duplicate -Werror flag from maintainer flags.
Description of the change
Fixed catch clause and removed #ifdef because it can be the same for Windows and Linux.
Removed duplicate -Werror flag from maintainer flags.
To post a comment you must log in.
Trivial fix only.