Merge origin/development changes

2016-01-07 11:08:55 -07:00
parent 4d954c775f 77b1c2ddc7
commit 57e52f67bb
29 changed files with 750 additions and 252 deletions
@@ -1,4 +1,5 @@
 /shairport-sync
+/shairport-sync.exe
 /*.o
 /*~
 *.xml~
@@ -16,6 +17,10 @@ install-sh
 missing
 stamp-h1
 .deps
+man/Makefile
+man/Makefile.in
+scripts/shairport-sync.service
+scripts/shairport-sync

 # Some eclipse project files
 .cproject