Merge trini/canadian-merge branch into org.openembedded.dev, fixup a

conflict on checksums.ini

1 files changed, 44 insertions, 0 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d8355adbd3..d48903a818 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2194,6 +2194,10 @@ sha256=5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
 md5=bcb9fabaf0eaf91bd38c4ee148658df8
 sha256=5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
 
+[http://downloads.sourceforge.net/mingw/binutils-2.17.50-20060824-1-src.tar.gz]
+md5=64905b00a89f4e7ba3b3991c89ba59a4
+sha256=1e041ad002aa2f7a06624afcb4a9832085c63abe0a9551cdbc40522aac18871a
+
 [http://kernel.org/pub/linux/devel/binutils/binutils-2.17.50.0.1.tar.bz2]
 md5=cfecfb29e260225fa192654f3763c2f8
 sha256=9a56b06e4f533745e9b7cde5b170f905f74d130b899f48498cbd6d376c664b7a
@@ -6234,6 +6238,30 @@ sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
 md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
 sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 
+[http://downloads.sourceforge.net/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz]
+md5=30154205636c12c6abcc462ce07550cf
+sha256=404358fe19326679f602de6f7d6a2db180e27af83813150f58ab28eec197b646
+
+[http://downloads.sourceforge.net/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz]
+md5=d0dc9d57d493889bc1ca88b127290b9d
+sha256=a21c2f48bb48d62935ee955ac8fa318658861f6316f30feb3cdec5337abf7f05
+
+[http://downloads.sourceforge.net/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz]
+md5=ca81c8420ab9d1d05ff9c73a9d4f7d63
+sha256=d54078fdccaa3776927b3931c15b880c43e76cb6a0fb59594d1b85cfc89356e9
+
+[http://downloads.sourceforge.net/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz]
+md5=57d489658743f0d9048e440b312740c8
+sha256=3ea32832e07571be317cdb1f9b9dc678a51ad2c2f066f91e155c449d0cf7d796
+
+[http://downloads.sourceforge.net/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz]
+md5=96b039f4e11bff4d3d8a4e7da6e3998d
+sha256=ec7a963c0dfd986697350be26e53577b0a39c86970b4e9485d85ca99b0cb2197
+
+[http://downloads.sourceforge.net/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz]
+md5=2bffc1e314f2efb1034b3d3ea1ce2f7d
+sha256=a8a3c0f0a38f819b87ff9282f1e40536f5050153f0f60db5c869509a70497c2c
+
 [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz]
 md5=fc49f45251c1336fe1dad5dba1c83fcd
 sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92
@@ -14622,6 +14650,14 @@ sha256=8ee3e48da07e20899a11adb9f2dd4dfc4922b43bcb1dc7bd78c55aceeb5eccc1
 md5=048aa29c31f067382cd669ee20934b9e
 sha256=4f65183200955540c097b82bfb18f5d21b636ca79f47cd018a4ea8b89cd2998c
 
+[http://downloads.sourceforge.net/mingw/mingw-runtime-3.14-src.tar.gz]
+md5=7d049a8331efcfe34600c0cda6934ac6
+sha256=a145a90d0824c65cfc11c3fc843ba484585983e1e8ee14b79f4d09cf1d38b98b
+
+[http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32-src.tar.gz]
+md5=0411b98fd5eeac0706e2abb7122526bb
+sha256=4f4d19f3e15fdf00957932211be609b6bf4e689ad5938ce7bff666a638bde0e7
+
 [http://www.denx.de/twiki/pub/Know/MiniFOHome/mini_fo-0-6-1-pre1.tar.bz2]
 md5=7e192e01b08023c7f3e63bf1c796bc14
 sha256=68c64a38f0b29347f86871248f0399e7e1b12645dc6263af7b2e4940f1392eaa
@@ -21406,6 +21442,14 @@ sha256=d6863b3ad5ecb465d217714ad474f2a9fb6e7890b4565184e8d5962d46850a31
 md5=a17be90788c4ccd6ee8253659b9321f8
 sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134
 
+[http://downloads.sourceforge.net/mingw/w32api-3.11-src.tar.gz]
+md5=bc37e4e6973f603c317a40602f7f35d9
+sha256=852fee2c0aa5cd9ff529c1ba1d28668796c7c3dc959376f6a207a0b178ac5225
+
+[http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-src.tar.gz]
+md5=8eae788a09a589414b83adc91bb0c069
+sha256=02cec615f8cfc94786ea9c1f41645cf43cc2414ca36b92fdd041304723bf2fc4
+
 [http://mpx.freeshell.net/w3cam-0.7.2.tar.gz]
 md5=eec0b301b32bc8e9f65a4e54248c9868
 sha256=96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0