hsanchez/oops — pull request #1 by linzhp (2013-02-13 06:16:07+00:00)
Title: Added header file directories

There was a conflict when I tried to pull from your branch. I did a three-way merging. Hope I didn't accidentally ignore some of your changes.