Changeset 271d1f96 for BOOK/packages.ent


Ignore:
Timestamp:
Jun 4, 2011, 8:28:21 AM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
193eb68
Parents:
0230c0a (diff), 622df7bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into simp

Conflicts:

BOOK/Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/packages.ent

    r0230c0a r271d1f96  
    268268<!ENTITY linux-dl-version "2.6">
    269269
    270 <!ENTITY linux-version "2.6.38.3">
    271 <!ENTITY linux-size "73,048 KB">
     270<!ENTITY linux-version "2.6.39">
     271<!ENTITY linux-size "74,316 KB">
    272272<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
    273 <!ENTITY linux-md5 "d3071407a33a7bd2ffb47181f200f22c">
     273<!ENTITY linux-md5 "1aab7a741abe08d42e8eccf20de61e05">
    274274<!ENTITY linux-home "http://www.kernel.org">
    275275
    … …  
    467467
    468468<!ENTITY zlib-version "1.2.5">
    469 <!ENTITY zlib-size "532 KB">
    470 <!ENTITY zlib-url "&sourceforge;libpng/zlib-&zlib-version;.tar.gz">
    471 <!ENTITY zlib-md5 "c735eab2d659a96e5a594c9e8541ad63">
     469<!ENTITY zlib-size "476 KB">
     470<!ENTITY zlib-url "http://zlib.net/zlib-&zlib-version;.tar.bz2">
     471<!ENTITY zlib-md5 "be1e89810e66150f5b0327984d8625a0">
    472472<!ENTITY zlib-home "http://www.zlib.net">
Note: See TracChangeset for help on using the changeset viewer.