From: Dan Klein <danklei@cisco.com>
Date: Sun, 23 Aug 2015 15:52:11 +0000 (+0300)
Subject: Merge branch 'master' into dan_latest
X-Git-Tag: v1.76~18^2~6
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=651a7d779551e193bd9dbadbe8b2a02bdab231b4;p=trex.git

Merge branch 'master' into dan_latest
---

651a7d779551e193bd9dbadbe8b2a02bdab231b4
diff --cc .gitignore
index 5b956fd0,16b0dfbf..5f5dc3a8
--- a/.gitignore
+++ b/.gitignore
@@@ -43,6 -45,9 +45,11 @@@ scripts/mock-
  ehthumbs.db
  Thumbs.db
  
 -# slickedit files #
 -###################
++
 +# IDE/ Editors files #
 +######################
 +.idea/
+ *.vpj
+ *.vpw
+ *.vtg
+ *.vpwhist