July 07, 2014 [phobos] [D-Programming-Language/installer] 3fddad: resolve merge conflict | ||||
---|---|---|---|---|
| ||||
Attachments:
| Branch: refs/heads/2.066 Home: https://github.com/D-Programming-Language/installer Commit: 3fddad77e2ebe36ff5cc771694e7b0fc1f708d59 https://github.com/D-Programming-Language/installer/commit/3fddad77e2ebe36ff5cc771694e7b0fc1f708d59 Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M linux/dmd_deb.sh A linux/icons/128/dmd-doc.png A linux/icons/32/dmd-source.png Log Message: ----------- resolve merge conflict Commit: 4c37c265133581cb3ba4e5160828eb13ecb23682 https://github.com/D-Programming-Language/installer/commit/4c37c265133581cb3ba4e5160828eb13ecb23682 Author: Jordi Sayol <g.sayol@yahoo.es> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M windows/dinstaller.nsi Log Message: ----------- Merge pull request #83 from eco/port-linux-nsis-features Port Windows installer features from linux\win version Commit: 2b80abde552e5cf2c13e8275cf8652f4d3f9cc74 https://github.com/D-Programming-Language/installer/commit/2b80abde552e5cf2c13e8275cf8652f4d3f9cc74 Author: Jordi Sayol <g.sayol@yahoo.es> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M windows/dinstaller.nsi Log Message: ----------- Merge pull request #84 from rainers/visuald_0.3.38-1 update Visual D version to 0.3.38-1 Commit: fcb966348b42d7394f52965f881a60fe082f61e3 https://github.com/D-Programming-Language/installer/commit/fcb966348b42d7394f52965f881a60fe082f61e3 Author: Jordi Sayol <g.sayol@yahoo.es> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M linux/dmd_deb.sh Log Message: ----------- Merge pull request #85 from AndrewEdwards/master Update dmd_deb.sh Commit: cb3fc98b1802cbe1de76a264fe34c13cb726664d https://github.com/D-Programming-Language/installer/commit/cb3fc98b1802cbe1de76a264fe34c13cb726664d Author: Jordi Sayol <g.sayol@yahoo.es> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M create_dmd_release/build_all.d M create_dmd_release/common.d M osx/Makefile Log Message: ----------- Merge pull request #88 from AndrewEdwards/master Improve versioning Commit: 97843e21cb346b5179fc70f7039c7afadbe70725 https://github.com/D-Programming-Language/installer/commit/97843e21cb346b5179fc70f7039c7afadbe70725 Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M create_dmd_release/common.d Log Message: ----------- Merge pull request #90 from MartinNowak/fixFileAttributes replace deprecated std.zip.ArchiveMember.madeVersion with fileAttributes Commit: 118c51e4f2de52a4ea6783ac6baa68b31771e334 https://github.com/D-Programming-Language/installer/commit/118c51e4f2de52a4ea6783ac6baa68b31771e334 Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M create_dmd_release/build_all.d Log Message: ----------- resolve merge conflict Commit: a784f5d98b8df416dd614a3bf6587b98d4fe2a1d https://github.com/D-Programming-Language/installer/commit/a784f5d98b8df416dd614a3bf6587b98d4fe2a1d Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: M create_dmd_release/common.d Log Message: ----------- Merge pull request #92 from MartinNowak/etag compare etag for cached downloads Commit: c68591d27d00f94c48ef2f6e88dca99c4239c958 https://github.com/D-Programming-Language/installer/commit/c68591d27d00f94c48ef2f6e88dca99c4239c958 Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: A create_dmd_release/.gitignore Log Message: ----------- Merge pull request #93 from MartinNowak/gitignore .gitignore rules for build script output Commit: 60d9712d14c01183f8337bb428f51f4da59bb2de https://github.com/D-Programming-Language/installer/commit/60d9712d14c01183f8337bb428f51f4da59bb2de Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: A .editorconfig Log Message: ----------- Merge pull request #89 from MartinNowak/editorconfig add .editorconfig Commit: b8aa5c0922482ed6afb9103c17eb6ed4442fc210 https://github.com/D-Programming-Language/installer/commit/b8aa5c0922482ed6afb9103c17eb6ed4442fc210 Author: AndrewEdwards <edwards.ac@gmail.com> Date: 2014-07-08 (Tue, 08 Jul 2014) Changed paths: A .editorconfig A create_dmd_release/.gitignore M create_dmd_release/build_all.d M create_dmd_release/common.d M linux/dmd_deb.sh A linux/icons/128/dmd-doc.png A linux/icons/32/dmd-source.png M osx/Makefile M windows/dinstaller.nsi Log Message: ----------- Merge pull request #94 from AndrewEdwards/2.066 2.066 update for v2.066.0-b2 Compare: https://github.com/D-Programming-Language/installer/compare/63c626c69ee9...b8aa5c092248 |
Copyright © 1999-2021 by the D Language Foundation