Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore

1 files changed, 4 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index a4bdc226..0a4a9da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,11 @@
 # Compiled source #
 ###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-.lock*
-linux_dpdk*
+.lock-waf*
+.waf*
 linux*
-scripts/_t-rex-*
-scripts/bp-sim-*
 scripts/doc/*
-scripts/mock-*
-
+build/
 *.pyc
-
  
 # Packages #
 ############
@@ -29,12 +19,7 @@ scripts/mock-*
 *.rar
 *.tar
 *.zip
-  
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
+*.vpj
  
 # OS generated files #
 ######################
@@ -45,7 +30,6 @@ scripts/mock-*
 ehthumbs.db
 Thumbs.db
 
-
 # IDE/ Editors files #
 ######################
 .idea/