Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / micropeak / .gitignore

diff --git a/micropeak/.gitignore b/micropeak/.gitignore
index ab80492bacd5045aceb24964cc5cbebd5ca47308..81dd0749e57a7b0b00a114c893f9e0412c0c6cf4 100644 (file)
--- a/micropeak/.gitignore
+++ b/micropeak/.gitignore
@@ -7,9 +7,11 @@ micropeak
 micropeak-test
 micropeak-jdb
 micropeak-windows.log
+micropeak-windows.nsi
 MicroPeak-Linux-*
 MicroPeak-Mac-*
 MicroPeak-Windows-*
+altusmetrum-micropeak.desktop
 *.dll
 *.dylib
 *.so
@@ -17,3 +19,4 @@ linux
 macosx
 CDM*.exe
 FTDI*.dmg
+Info.plist