<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>776c381cec6b54cd325e7c50ccad27048920b2ae</id>
      </parent>
      <parent>
        <id>3f882bd3847227a4867a5f791ee12f96c23933a2</id>
      </parent>
    </parents>
    <author>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/082488bad62dd2f89e42eee3744dcd19cf378a0b</url>
    <id>082488bad62dd2f89e42eee3744dcd19cf378a0b</id>
    <committed-date>2008-05-16T08:33:57-07:00</committed-date>
    <authored-date>2008-05-16T08:33:57-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/cv/opencv-wrappers

Conflicts:

	color_filtering.py
	wrappers.py</message>
    <tree>13318b5c6bb360aabe67867e640c5151884d1039</tree>
    <committer>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1544a0f2f3e540e0818a4f44d9f3d2f83b2649f3</id>
      </parent>
    </parents>
    <author>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/776c381cec6b54cd325e7c50ccad27048920b2ae</url>
    <id>776c381cec6b54cd325e7c50ccad27048920b2ae</id>
    <committed-date>2008-05-16T08:18:09-07:00</committed-date>
    <authored-date>2008-05-16T08:18:09-07:00</authored-date>
    <message>Modified color filtering. Working with red, but still needs some
calibration</message>
    <tree>b7098bbc9a03d75cd1a569272fb5f78f8763a99e</tree>
    <committer>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0e0b9b1c6310d21a6af1c956891419b7b1510622</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/3f882bd3847227a4867a5f791ee12f96c23933a2</url>
    <id>3f882bd3847227a4867a5f791ee12f96c23933a2</id>
    <committed-date>2008-05-16T08:06:53-07:00</committed-date>
    <authored-date>2008-05-16T08:06:53-07:00</authored-date>
    <message>added create*Image methods to create colour-filled images</message>
    <tree>4cefc0479131cd1758925d9a35f1e7ff62e0c961</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1eb0d3ba07b70e133a5493ef3681ac3bb0fd1b9a</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/0e0b9b1c6310d21a6af1c956891419b7b1510622</url>
    <id>0e0b9b1c6310d21a6af1c956891419b7b1510622</id>
    <committed-date>2008-05-16T07:19:57-07:00</committed-date>
    <authored-date>2008-05-16T07:19:57-07:00</authored-date>
    <message>added create*Image methods to create colour-filled images</message>
    <tree>950d69a9cc99796aa29f4c6c3cc43700f9b21ad3</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2405e7f52b5a476d7356462eab2a82baaa7cfc21</id>
      </parent>
      <parent>
        <id>1544a0f2f3e540e0818a4f44d9f3d2f83b2649f3</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/1eb0d3ba07b70e133a5493ef3681ac3bb0fd1b9a</url>
    <id>1eb0d3ba07b70e133a5493ef3681ac3bb0fd1b9a</id>
    <committed-date>2008-05-16T06:47:05-07:00</committed-date>
    <authored-date>2008-05-16T06:47:05-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:cv/opencv-wrappers</message>
    <tree>74fe4d308bf5607238df43ae50524c16f8f9f5d9</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f28630545b08934e8fda9cf63e0802937f64ed47</id>
      </parent>
    </parents>
    <author>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/1544a0f2f3e540e0818a4f44d9f3d2f83b2649f3</url>
    <id>1544a0f2f3e540e0818a4f44d9f3d2f83b2649f3</id>
    <committed-date>2008-05-16T06:46:16-07:00</committed-date>
    <authored-date>2008-05-16T06:46:16-07:00</authored-date>
    <message>Added setColor (not working) to wrappers.py</message>
    <tree>efd9f16965f1380896a2f6851b4ca2d4f61c38e8</tree>
    <committer>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>568b0f141d49d2488a00dfb82226aa4bdab95c8c</id>
      </parent>
      <parent>
        <id>f28630545b08934e8fda9cf63e0802937f64ed47</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/2405e7f52b5a476d7356462eab2a82baaa7cfc21</url>
    <id>2405e7f52b5a476d7356462eab2a82baaa7cfc21</id>
    <committed-date>2008-05-16T06:44:46-07:00</committed-date>
    <authored-date>2008-05-16T06:44:46-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:cv/opencv-wrappers</message>
    <tree>a1b6b7d885f15e6233684a571a50a8cb5b7ffcc7</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>627bd70a6b50bf1f4a84ffae8a54426d629f2e9b</id>
      </parent>
    </parents>
    <author>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/f28630545b08934e8fda9cf63e0802937f64ed47</url>
    <id>f28630545b08934e8fda9cf63e0802937f64ed47</id>
    <committed-date>2008-05-16T06:37:48-07:00</committed-date>
    <authored-date>2008-05-16T06:37:48-07:00</authored-date>
    <message>Added color_filtering.py
Added color conversion functions (not working) to
wrapper.py</message>
    <tree>3a80412bf750965bf714df922abfae66d7e7ce3d</tree>
    <committer>
      <name>Francisco Trindade</name>
      <email>frank.trindade@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>627bd70a6b50bf1f4a84ffae8a54426d629f2e9b</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/568b0f141d49d2488a00dfb82226aa4bdab95c8c</url>
    <id>568b0f141d49d2488a00dfb82226aa4bdab95c8c</id>
    <committed-date>2008-05-16T01:48:36-07:00</committed-date>
    <authored-date>2008-05-16T01:48:36-07:00</authored-date>
    <message>fixed a bug with getKeyPressed()</message>
    <tree>526c63ab601d393a7cb42202bfffd766df145d4e</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>93d69c8ae49b582eb57ea982c68658f3e90126af</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/627bd70a6b50bf1f4a84ffae8a54426d629f2e9b</url>
    <id>627bd70a6b50bf1f4a84ffae8a54426d629f2e9b</id>
    <committed-date>2008-05-15T16:22:31-07:00</committed-date>
    <authored-date>2008-05-15T16:22:31-07:00</authored-date>
    <message>fixed indentation (soft tabs=2 ftw), objectified finger tracking demo - looks more verbose, but it's easier to expand with new key events and the image manipulation stuff is a little more contained</message>
    <tree>61871949ec7758125439b176826b9954f5aea626</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2fc90b1151cc2c5a7608d359b60b0c6bebcc0916</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/93d69c8ae49b582eb57ea982c68658f3e90126af</url>
    <id>93d69c8ae49b582eb57ea982c68658f3e90126af</id>
    <committed-date>2008-05-15T14:20:31-07:00</committed-date>
    <authored-date>2008-05-15T14:20:31-07:00</authored-date>
    <message>removed pyc</message>
    <tree>872c45967ce662690d4088790e0990ffe0061906</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e50f9e370cf84c187c6a4e6dec7f29e63929bab9</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/2fc90b1151cc2c5a7608d359b60b0c6bebcc0916</url>
    <id>2fc90b1151cc2c5a7608d359b60b0c6bebcc0916</id>
    <committed-date>2008-05-15T14:19:57-07:00</committed-date>
    <authored-date>2008-05-15T14:19:57-07:00</authored-date>
    <message>added *.pyc to ignores</message>
    <tree>1c434082710b7e541c085a3538ae73d3bc626b2c</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>60a5cd41b3f8ee6ce7fa1a54663e8286c4b0b1ee</id>
      </parent>
    </parents>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/e50f9e370cf84c187c6a4e6dec7f29e63929bab9</url>
    <id>e50f9e370cf84c187c6a4e6dec7f29e63929bab9</id>
    <committed-date>2008-05-15T14:19:09-07:00</committed-date>
    <authored-date>2008-05-15T14:19:09-07:00</authored-date>
    <message>added finger tracking demo and camera display example</message>
    <tree>33e243b4e61a0c4dc1e8cb56aff6751708ef3205</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array"/>
    <author>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </author>
    <url>http://github.com/cv/opencv-wrappers/commit/60a5cd41b3f8ee6ce7fa1a54663e8286c4b0b1ee</url>
    <id>60a5cd41b3f8ee6ce7fa1a54663e8286c4b0b1ee</id>
    <committed-date>2008-05-15T14:16:17-07:00</committed-date>
    <authored-date>2008-05-15T14:16:17-07:00</authored-date>
    <message>added initial implementation, README and a finger-tracking example (still very much in progress)</message>
    <tree>3691381f6b50966a69d887100f7917b8a9898f11</tree>
    <committer>
      <name>Carlos Villela</name>
      <email>cv@lixo.org</email>
    </committer>
  </commit>
</commits>
