Merge branch 'master' into next

netzob · Apr 30, 2017 · cdc3971 · cdc3971
2 parents ba460f4 + aa55f49
commit cdc3971
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,4 @@ include/python*
 lib/python*
 lib64
 *.log
-
+dist/
diff --git a/netzob/src/netzob/release.py b/netzob/src/netzob/release.py
@@ -53,7 +53,7 @@
 #+---------------------------------------------------------------------------+
 #| Description of the application
 #+---------------------------------------------------------------------------+
-description = "Inferring communication protocols"
+description = "Protocol Reverse Engineering, Modeling and Fuzzing"
 
 #+---------------------------------------------------------------------------+
 #| Platforms on which the application can be executed