From: Chris Tallon <chris@vomp.tv>
Date: Sun, 6 Jan 2013 14:23:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'vompclient-raspi/master'
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=0189f0c04df7b85624a7708b93e90b2241d670f8;p=vompclient-marten.git

Merge remote-tracking branch 'vompclient-raspi/master'
---

0189f0c04df7b85624a7708b93e90b2241d670f8
diff --cc .gitignore
index 3d8d66c,5f38b8e..8aa4cc7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,8 +1,11 @@@
+ #do not include make output
  *.o
+ vompclient
  deps
++#ignore target-* directory links
 +target-*
- vompclient
 +*~
+ #ignore eclipse project files
+ .project
+ .cproject
 -.#*
++.#*