googlesamples/tango-examples-c — pull request #29 by connerbrooks (2014-12-24 02:40:41+00:00)
Title: Fixes gitignore merge conflict.

Simplifies gitignore, and removes conflicts.