Skip to content

Commit

Permalink
Merge branch '2.2-dev' into issue_316_floating_window
Browse files Browse the repository at this point in the history
  • Loading branch information
RichardTea committed Mar 4, 2024
2 parents 8d19f3d + c31c20a commit 11b3d78
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 17 deletions.
37 changes: 20 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,26 @@ Makefile*
# Visual Studio
.vs/*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# MSBuild Binary and Structured Log
*.binlog

#Linux libs
*.so.*

Expand All @@ -50,23 +70,6 @@ out/build/*
*.AppImage
*.deb

#Linux installer autogenerated
install/linux/AppDir/\.DirIcon
install/linux/AppDir/AppRun
install/linux/AppDir/*.desktop
install/linux/AppDir/*.png
install/linux/AppDir/qt\.conf
install/linux/AppDir/sACNView
install/linux/COPYRIGHT
install/linux/usr/share/icons/hicolor/16x16/apps/sacnview\.png
install/linux/usr/share/icons/hicolor/24x24/apps/sacnview\.png
install/linux/usr/share/icons/hicolor/256x256/apps/sacnview\.png
install/linux/usr/share/icons/hicolor/32x32/apps/sacnview\.png
install/linux/usr/share/icons/hicolor/48x48/apps/sacnview\.png
install/linux/usr/share/icons/hicolor/scalable/apps/sacnview\.png
install/linux/build/
install/linux/fpm-checkout/

#Translations
translations/sACNView\.ts

Expand Down
30 changes: 30 additions & 0 deletions install/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Folder for developer-specific installer signing, eg NSIS include

signing/

# Installer creation log files

*.log
*.tmp

# Windows signtool steps: digest, signed digest, unsigned PKCS7
*.dig
*.dig.signed
*.p7u

#Linux installer autogenerated
linux/AppDir/\.DirIcon
linux/AppDir/AppRun
linux/AppDir/*.desktop
linux/AppDir/*.png
linux/AppDir/qt\.conf
linux/AppDir/sACNView
linux/COPYRIGHT
linux/usr/share/icons/hicolor/16x16/apps/sacnview\.png
linux/usr/share/icons/hicolor/24x24/apps/sacnview\.png
linux/usr/share/icons/hicolor/256x256/apps/sacnview\.png
linux/usr/share/icons/hicolor/32x32/apps/sacnview\.png
linux/usr/share/icons/hicolor/48x48/apps/sacnview\.png
linux/usr/share/icons/hicolor/scalable/apps/sacnview\.png
linux/build/
linux/fpm-checkout/

0 comments on commit 11b3d78

Please sign in to comment.