commit: a739b5410b53894d77ca32314587090ba37753a0
Author: Tomáš Chaloupka <chalucha <AT> gmail <DOT> com>
AuthorDate: Tue Jul 1 16:11:45 2014 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Jul 1 16:11:45 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/dotnet.git;a=commit;h=a739b541
Merge remote-tracking branch 'upstream/master'
Conflicts:
dev-util/monodevelop/Manifest
dev-dotnet/fake/Manifest | 2 +-
...ake-2.1.687_alpha.ebuild => fake-2.13.0.ebuild} | 0
dev-dotnet/libgdiplus/libgdiplus-9999.ebuild | 4 ++--
dev-lang/fsharp/Manifest | 3 +--
dev-lang/fsharp/fsharp-3.1.0.ebuild | 28 ----------------------
...fsharp-3.0.30.ebuild => fsharp-3.1.1.14.ebuild} | 0
dev-lang/mono/Manifest | 2 ++
.../mono/{mono-3.2.3.ebuild => mono-3.2.8.ebuild} | 2 +-
.../mono/{mono-3.2.3.ebuild => mono-3.4.0.ebuild} | 5 ++--
dev-util/monodevelop/Manifest | 1 +
...velop-5.0.1.ebuild => monodevelop-4.2.3.ebuild} | 2 +-
profiles/package.unmask | 5 +++-
12 files changed, 16 insertions(+), 38 deletions(-)
diff --cc dev-util/monodevelop/Manifest
index 333ae7c,b5750a8..8174ef9
--- a/dev-util/monodevelop/Manifest
+++ b/dev-util/monodevelop/Manifest
@@@ -3,4 -3,4 +3,5 @@@ DIST monodevelop-4.0.tar.bz2 27625939 S
DIST monodevelop-4.1.9-6.tar.bz2 29544974 SHA256
9b5da22831d35a08cad5368bcb75f8ce072167384926b6ba7d179abfa2672622 SHA512
d7045fec5953c0b7e857e5002504d55e53ceb048c2595e04c7906795eba60e2f0cf32be00ac2427fcca431406dd7966aed31e7bdb1a0d3ec20e6b343313302de
WHIRLPOOL
4dd5af88fd73eabb6d14b0bdd69bac0e45650d748179702ae6f48f85160760e792c676fbed7fd1e2c5dafe50e2ad2eb790bbbd985d7cc710076f54c9d7b02646
DIST monodevelop-4.2-2.tar.bz2 30640329 SHA256
79c39fcd42e96419342e95a4c7ffa65bf967e8d5b0142423c97ecfffd6c3f045 SHA512
8a8025c2af8adf05a669308b95c13ab7783bd0b5987a03179d49e204cc2cd725b078f33fa57414c0024255f2137a8a9589062c9c5164d48186d486ae0a6cafaf
WHIRLPOOL
12ed74fd023f9895d0918587af39be5ceb2bfe9f6af9b4e31486b36af8c460c7ef173a68b766c77ca3ad9430fb543c6f0b11bb2b67670839685afa0fdf04181e
DIST monodevelop-4.2.2-2.tar.bz2 30665688 SHA256
89a2254605b2dabb9167ff19ce441b1d9c718c6cfae555df05f73ed5a904b109 SHA512
d15cdac2c0a02612f353aa3338f585547de92597a4273ae5a472478ef4efd04787cacadd3a9d16c3a1dc1aac0a89ff8cef6502f00c13c214b27e6f2adc382d8f
WHIRLPOOL
ba855dc7ea25e15160814841db77a0dffef9a9a3a4f1fa3b62da31a58519137dc7bb6716b0d175162fa8f51af32def2aa3100290ad9cd05b351f6aded5220123
+ DIST monodevelop-4.2.3.tar.bz2 35944908 SHA256
f20bc767c392ca5e25ee0c6e6ab2faefee71a0a793a96d93d6b27fcf3a5ec182 SHA512
4654e0492d91381463630a245f2cdfb505d70f391c44d8f12ccc2f67108b0f944be54dc22417958d0fe976b2357a96830b75ed022417690b9ab80a6bea4a6514
WHIRLPOOL
d8d194e85ed0751a6d06419343c9c48bff9b760cd96e38db9e506fa107dc7e9e18e41ba887e831b6b3cb1e4c95496177d2c90515e99805103148b496afe6ea8b
+DIST monodevelop-5.0.1-0.tar.bz2 40028740 SHA256
9ca0bc425a870552cfe5ab038a7f52935df2e9d6c5c427129f05ff285e0ddd62 SHA512
70791f24a0aa504892a1bdc9d7f3590ebe2d50fd5659e31ad380af181cb9452de63e009545be3057299e3a4b45aa5ea88c33969bfe0bb1ed77a8aaedabe85864
WHIRLPOOL
b6f0a89074a5b61d2472b0169c5bd10155c978501ffc250335af2b27fd03b7ef0617df449e45ae4ec62984ff896eb9fdf11ecec21dbbba22cdee05ca0e55b24d
