Merge "Upgrade to Argon SR2"

[ccsdk/parent.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ebb44b7..5bcfad2 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ org.eclipse.core.resources.prefs
 .checkstyle
 maven-eclipse.xml
 workspace
+.vscode
+*.orig
 
 ## Compilation Files ##
 *.class
@@ -17,6 +19,7 @@ workspace
 target
 target-ide
 MANIFEST.MF
+**/__pycache__
 
 ## Misc Ignores (OS specific etc) ##
 bin/