Merge lp:~nickpapior/siesta/4.1-cml into lp:~albertog/siesta/4.1-cml
Proposed by
Nick Papior
Status: | Merged |
---|---|
Approved by: | Alberto Garcia |
Approved revision: | 600 |
Merged at revision: | 601 |
Proposed branch: | lp:~nickpapior/siesta/4.1-cml |
Merge into: | lp:~albertog/siesta/4.1-cml |
Diff against target: |
129 lines (+10/-15) 8 files modified
NOTICE.txt (+0/-3) Obj/DOCUMENTED-TEMPLATE.make (+1/-1) Src/wxml/m_wxml_core.f90 (+3/-3) Src/wxml/m_wxml_elstack.f90 (+1/-1) Util/CMLComp/ccViz (+2/-2) Util/SiestaSubroutine/ProtoNEB/Src/Makefile (+1/-2) Util/SiestaSubroutine/SimpleTest/Src/Makefile (+1/-2) version.info (+1/-1) |
To merge this branch: | bzr merge lp:~nickpapior/siesta/4.1-cml |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Garcia | Approve | ||
Review via email: mp+308962@code.launchpad.net |
Description of the change
Fixed some minor things and updated last references to FoX in makefile and NOTICE.txt
To post a comment you must log in.