[phobos] [D-Programming-Language/installer] 3fddad: resolve merge conflict
GitHub via phobos
phobos at puremagic.com
Thu Sep 11 11:57:36 PDT 2014
Branch: refs/heads/master
Home: https://github.com/D-Programming-Language/installer
Commit: 3fddad77e2ebe36ff5cc771694e7b0fc1f708d59
https://github.com/D-Programming-Language/installer/commit/3fddad77e2ebe36ff5cc771694e7b0fc1f708d59
Author: AndrewEdwards <edwards.ac at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
Commit: 66f12f75c0e400594dfbdce4cff71b6484df27e2
https://github.com/D-Programming-Language/installer/commit/66f12f75c0e400594dfbdce4cff71b6484df27e2
Author: Martin Nowak <code at dawg.eu>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M linux/dmd_deb.sh
Log Message:
-----------
Merge pull request #95 from jordisayol/master
create *.html symblinks to avoid local broken links. deb packages.
Commit: 251744d1c99978681fd0fe8b8903f4fd27dd49fd
https://github.com/D-Programming-Language/installer/commit/251744d1c99978681fd0fe8b8903f4fd27dd49fd
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M linux/dmd_deb.sh
Log Message:
-----------
Merge pull request #96 from AndrewEdwards/2.066
Merge pull request #95 from jordisayol/master
Commit: a97316e080801301b3334d5daa7b5a8aadfea36b
https://github.com/D-Programming-Language/installer/commit/a97316e080801301b3334d5daa7b5a8aadfea36b
Author: Jordi Sayol <g.sayol at yahoo.es>
Date: 2014-07-21 (Mon, 21 Jul 2014)
Changed paths:
M create_dmd_release/build_all.d
A windows/d1-installer-descriptions.nsh
A windows/d1-installer-image.bmp
A windows/d1-installer.nsi
A windows/d2-installer-descriptions.nsh
A windows/d2-installer-image.bmp
A windows/d2-installer.nsi
R windows/dinstaller.nsi
R windows/dinstaller_descriptions.nsh
A windows/dmc-installer-descriptions.nsh
A windows/dmc-installer-image.bmp
A windows/dmc-installer.nsi
R windows/installer_image.bmp
Log Message:
-----------
Merge pull request #97 from eco/specify-installed-dir
Revamp Windows installer
Commit: 6c42659ca5530693210f91873a05683b74aeb5bf
https://github.com/D-Programming-Language/installer/commit/6c42659ca5530693210f91873a05683b74aeb5bf
Author: Brad Anderson <eco at gnuk.net>
Date: 2014-07-21 (Mon, 21 Jul 2014)
Changed paths:
R linux/dmd_win.sh
M linux/readme
R linux/win/EnvVarUpdate.nsh
R linux/win/installer-icon.ico
R linux/win/installer.nsi
R linux/win/installer_descriptions.nsh
R linux/win/installer_image.bmp
R linux/win/uninstaller-icon.ico
Log Message:
-----------
Merge pull request #99 from jordisayol/master
delete obsolete windows installer script builder on Linux folder
Commit: 2b4aeb4409138e9e668f7086d2e4d0d5178f03d9
https://github.com/D-Programming-Language/installer/commit/2b4aeb4409138e9e668f7086d2e4d0d5178f03d9
Author: Jordi Sayol <g.sayol at yahoo.es>
Date: 2014-07-21 (Mon, 21 Jul 2014)
Changed paths:
M create_dmd_release/build_all.d
R linux/dmd_win.sh
M linux/readme
R linux/win/EnvVarUpdate.nsh
R linux/win/installer-icon.ico
R linux/win/installer.nsi
R linux/win/installer_descriptions.nsh
R linux/win/installer_image.bmp
R linux/win/uninstaller-icon.ico
A windows/d1-installer-descriptions.nsh
A windows/d1-installer-image.bmp
A windows/d1-installer.nsi
A windows/d2-installer-descriptions.nsh
A windows/d2-installer-image.bmp
A windows/d2-installer.nsi
R windows/dinstaller.nsi
R windows/dinstaller_descriptions.nsh
A windows/dmc-installer-descriptions.nsh
A windows/dmc-installer-image.bmp
A windows/dmc-installer.nsi
R windows/installer_image.bmp
Log Message:
-----------
Merge pull request #100 from AndrewEdwards/2.066
Cherry-picking commits from master to 2.066 branch (for beta5)
Commit: 92e457ae71c9ac8f9e9af58fe928b4d29c1c4159
https://github.com/D-Programming-Language/installer/commit/92e457ae71c9ac8f9e9af58fe928b4d29c1c4159
Author: Brad Anderson <eco at gnuk.net>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M create_dmd_release/build_all.d
Log Message:
-----------
Merge pull request #101 from MartinNowak/fixup97
fixup #97 - embed dmd in windows installer
Commit: 88b0f9662ceed04052a938c2c17766d232321f97
https://github.com/D-Programming-Language/installer/commit/88b0f9662ceed04052a938c2c17766d232321f97
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M create_dmd_release/build_all.d
Log Message:
-----------
Merge pull request #103 from eco/dmd2-only
Embed "dmd2" folder, not its parent
Commit: 407fa77ccf5af0717c50c69dddef0ffdba6951f3
https://github.com/D-Programming-Language/installer/commit/407fa77ccf5af0717c50c69dddef0ffdba6951f3
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M windows/d2-installer.nsi
Log Message:
-----------
Merge pull request #104 from eco/download-run-fix
Fix Visual D download
Commit: 84491f757537900facd96737cccf34fea100f45c
https://github.com/D-Programming-Language/installer/commit/84491f757537900facd96737cccf34fea100f45c
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M create_dmd_release/build_all.d
Log Message:
-----------
Merge pull request #105 from eco/include-win-curl
Add libcurl binaries to windows release
Commit: 95b2cf18b8059fb3b4b3bad7911a74129f9df4bc
https://github.com/D-Programming-Language/installer/commit/95b2cf18b8059fb3b4b3bad7911a74129f9df4bc
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M create_dmd_release/build_all.d
M windows/d2-installer.nsi
Log Message:
-----------
Merge pull request #106 from AndrewEdwards/2.066
Cherry-picking commits from master to 2.066 branch (for RC2)
Commit: 6cb2cfeb7522879f4f0195c94dc47342b8d36cf3
https://github.com/D-Programming-Language/installer/commit/6cb2cfeb7522879f4f0195c94dc47342b8d36cf3
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M create_dmd_release/build_all.d
Log Message:
-----------
Merge pull request #107 from AndrewEdwards/master
fixup 105: add 32-bit curl.lib
Commit: 191348e6727c5c287dddb528039cf96f32f62913
https://github.com/D-Programming-Language/installer/commit/191348e6727c5c287dddb528039cf96f32f62913
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M create_dmd_release/build_all.d
Log Message:
-----------
Merge pull request #108 from AndrewEdwards/2.066
Merge pull request #107 from AndrewEdwards/master
Commit: f26b1728d650ea710ba131c8567c931ab75f2e3a
https://github.com/D-Programming-Language/installer/commit/f26b1728d650ea710ba131c8567c931ab75f2e3a
Author: Martin Nowak <code at dawg.eu>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Log Message:
-----------
Merge branch '2.066'
Conflicts:
windows/d1-installer.nsi
windows/dmc-installer.nsi
Commit: 33cce4537bb1cf7384ed0f213e440ec30067b0a8
https://github.com/D-Programming-Language/installer/commit/33cce4537bb1cf7384ed0f213e440ec30067b0a8
Author: AndrewEdwards <edwards.ac at gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Log Message:
-----------
Merge pull request #110 from MartinNowak/merge2.066
Merge branch '2.066'
Compare: https://github.com/D-Programming-Language/installer/compare/1ff68fb63c75...33cce4537bb1
More information about the phobos
mailing list