Merging to master branch 3.0rc0

dasl- · Aug 3, 2017 · c677ad4 · c677ad4
2 parents 0e9190a + 94d89b8
commit c677ad4
Show file tree

Hide file tree

Showing 45 changed files with 5,580 additions and 2,145 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 /INSTALL
 /shairport-sync
 /shairport-sync.exe
-/*.o
+*.o
 /*~
 *.xml~
 /config.mk
@@ -17,6 +17,7 @@ depcomp
 install-sh
 missing
 stamp-h1
+.dirstamp
 .deps
 man/Makefile
 man/Makefile.in
@@ -26,3 +27,7 @@ scripts/shairport-sync
 # Some eclipse project files
 .cproject
 .project
+
+# macOS stuff
+.DS_Store
+shairport-sync.xcodeproj