<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>0cb03d519960c92b7c04e7cf0f7cdbc6e880acca</id>
      </parent>
      <parent>
        <id>4480dc68f5d90be3eb3bb4fb9569771949fa48eb</id>
      </parent>
    </parents>
    <author>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/934169bc049aeaf423b9b93f13de43c1a2bc2c00</url>
    <id>934169bc049aeaf423b9b93f13de43c1a2bc2c00</id>
    <committed-date>2009-04-06T21:59:02-07:00</committed-date>
    <authored-date>2009-04-06T21:59:02-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/nathansmith/960-grid-system

* 'master' of git://github.com/nathansmith/960-grid-system:
  Updates to the .clearfix class, per the suggestions in this article:

Conflicts:
	code/css/960.css</message>
    <tree>7f6eaac33810ad22c319b25cf84b2ae74a0b9f2c</tree>
    <committer>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>96eca8c2c46d998437aadba07f27b380c54f901b</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/4480dc68f5d90be3eb3bb4fb9569771949fa48eb</url>
    <id>4480dc68f5d90be3eb3bb4fb9569771949fa48eb</id>
    <committed-date>2009-04-06T15:57:07-07:00</committed-date>
    <authored-date>2009-04-06T15:57:07-07:00</authored-date>
    <message>Updates to the .clearfix class, per the suggestions in this article:

http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack

Special thanks to @mixmanner for the heads-up!

http://github.com/mixmanner</message>
    <tree>ee15ca17593e4785d20dcf22e9535b10bb022236</tree>
    <committer>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7dbb400c069a6e3074a9f8d9eaaf6f4eee4cadbc</id>
      </parent>
      <parent>
        <id>96eca8c2c46d998437aadba07f27b380c54f901b</id>
      </parent>
    </parents>
    <author>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/0cb03d519960c92b7c04e7cf0f7cdbc6e880acca</url>
    <id>0cb03d519960c92b7c04e7cf0f7cdbc6e880acca</id>
    <committed-date>2009-04-03T09:36:26-07:00</committed-date>
    <authored-date>2009-04-03T09:35:35-07:00</authored-date>
    <message>Added a fix for Firefox 3.x, using the .clearfix class.

* 'master' of git://github.com/nathansmith/960-grid-system:
  Added a fix for Firefox 3.x, using the .clearfix class.

Conflicts:
	code/css/960.css</message>
    <tree>945016fe2e665322a0d63c63f94e35dbd9ef98b0</tree>
    <committer>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9ce79336203650d66836e7e58e8eac303aea3282</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/96eca8c2c46d998437aadba07f27b380c54f901b</url>
    <id>96eca8c2c46d998437aadba07f27b380c54f901b</id>
    <committed-date>2009-04-02T21:09:24-07:00</committed-date>
    <authored-date>2009-04-02T21:09:24-07:00</authored-date>
    <message>Added a fix for Firefox 3.x, using the .clearfix class.</message>
    <tree>9ba87374a0eab7675a0e31545fdaa8ea8cd0dc5f</tree>
    <committer>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>45da7eaa5461d4e6d5d6725d2af6bd97ed2eb273</id>
      </parent>
    </parents>
    <author>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/7dbb400c069a6e3074a9f8d9eaaf6f4eee4cadbc</url>
    <id>7dbb400c069a6e3074a9f8d9eaaf6f4eee4cadbc</id>
    <committed-date>2009-03-31T11:57:33-07:00</committed-date>
    <authored-date>2009-03-31T11:57:33-07:00</authored-date>
    <message>renamed the background images -- ready for use!</message>
    <tree>2ac2e3af717b7ec2a6d3a57082ed44806b2dc1ed</tree>
    <committer>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9ce79336203650d66836e7e58e8eac303aea3282</id>
      </parent>
    </parents>
    <author>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/45da7eaa5461d4e6d5d6725d2af6bd97ed2eb273</url>
    <id>45da7eaa5461d4e6d5d6725d2af6bd97ed2eb273</id>
    <committed-date>2009-03-31T11:51:34-07:00</committed-date>
    <authored-date>2009-03-31T11:51:34-07:00</authored-date>
    <message>altered grid.css to not use the 10 pixel margins at all
removed the alpha and omega classes
added 2 new background images for 12 and 16 column containers
templates and sketch sheets need updating now</message>
    <tree>82e11b9bc387784a86bad258676c86e0d511a10f</tree>
    <committer>
      <name>Russell Jones</name>
      <email>spam@codeofficer.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>568eeac257602df35a920b18eafc8a5bb6e8825d</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/9ce79336203650d66836e7e58e8eac303aea3282</url>
    <id>9ce79336203650d66836e7e58e8eac303aea3282</id>
    <committed-date>2009-03-01T14:17:46-08:00</committed-date>
    <authored-date>2009-03-01T14:17:46-08:00</authored-date>
    <message>Adding templates for Adobe Illustrator.</message>
    <tree>b162e1480e4a8caa5b9802d892dfbb409cd7a288</tree>
    <committer>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>155493095673a8ee1ae32c8adf854238ef664dcd</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/568eeac257602df35a920b18eafc8a5bb6e8825d</url>
    <id>568eeac257602df35a920b18eafc8a5bb6e8825d</id>
    <committed-date>2009-02-20T15:15:23-08:00</committed-date>
    <authored-date>2009-02-20T15:15:23-08:00</authored-date>
    <message>Initial push of 960 Grid System.</message>
    <tree>46f4d74deab1652016b48a740a6d020be20660df</tree>
    <committer>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9e942bbe3c1b5516dc05b5841699d326326fe400</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/155493095673a8ee1ae32c8adf854238ef664dcd</url>
    <id>155493095673a8ee1ae32c8adf854238ef664dcd</id>
    <committed-date>2009-02-20T15:15:02-08:00</committed-date>
    <authored-date>2009-02-20T15:15:02-08:00</authored-date>
    <message>Deleting initial README. Oops.</message>
    <tree>4b825dc642cb6eb9a060e54bf8d69288fbee4904</tree>
    <committer>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array"/>
    <author>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </author>
    <url>http://github.com/CodeOfficer/960-grid-system-without-margins/commit/9e942bbe3c1b5516dc05b5841699d326326fe400</url>
    <id>9e942bbe3c1b5516dc05b5841699d326326fe400</id>
    <committed-date>2009-02-20T15:01:27-08:00</committed-date>
    <authored-date>2009-02-20T15:01:27-08:00</authored-date>
    <message>first commit</message>
    <tree>543b9bebdc6bd5c4b22136034a95dd097a57d3dd</tree>
    <committer>
      <name>Nathan Smith</name>
      <email>nathan@sonspring.com</email>
    </committer>
  </commit>
</commits>
