commit | 7d0a4a57fbcd47f72b67c08df532e8ef47f6fdae | [log] [tgz] |
---|---|---|
author | Garrett Cooper <yanegomi@gmail.com> | Thu Dec 16 10:05:08 2010 -0800 |
committer | Garrett Cooper <yanegomi@gmail.com> | Thu Dec 16 10:05:08 2010 -0800 |
tree | 425a2ed5ae42d045ef4b6968d5b89b9c2e644665 | |
parent | ad14e9003b9f1070deca0498b341ab3deef3055d [diff] |
Cleanup style and get rid of conflicts problems. Signed-off-by: Garrett Cooper <yanegomi@gmail.com>