]> git.vomp.tv Git - vompclient-marten.git/commitdiff
Merge remote-tracking branch 'vompclient-raspi/master'
authorChris Tallon <chris@vomp.tv>
Sun, 6 Jan 2013 14:23:02 +0000 (14:23 +0000)
committerChris Tallon <chris@vomp.tv>
Sun, 6 Jan 2013 14:23:02 +0000 (14:23 +0000)
1  2 
.gitignore
GNUmakefile

diff --cc .gitignore
index 3d8d66c90f9dcad32a6d048b61a3401c72afcf50,5f38b8e893f7109fb97109f008e33e4e36ff61ba..8aa4cc78ae55d2e6b686255338fefbe77c05c9f8
@@@ -1,5 -1,8 +1,11 @@@
+ #do not include make output
  *.o
+ vompclient
  deps
- vompclient
++#ignore target-* directory links
 +target-*
 -.#*
 +*~
+ #ignore eclipse project files
+ .project
+ .cproject
++.#*
diff --cc GNUmakefile
Simple merge