1.3.6 released

henrypp · Nov 20, 2016 · cb17e07 · cb17e07
1 parent 0581152
commit cb17e07
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+*.c diff
+*.cpp diff
+*.h diff
+*.rc diff
+*.ini diff
+*.txt diff
+*.xml diff
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+v1.3.6 (20 November 2016)
++ added loopback permission for boot-time filters
++ added ip:port syntax for special rules
++ added default values for new special rules
+- fixed restore listview selection
+- fixed special rules crash on delete item
+- fixed log path unexpand environment strings
+
 v1.3.5 (17 November 2016)
 - fixed configuration saving (critical)
 - fixed xml saving (critical)

diff --git a/bin/History.txt b/bin/History.txt
@@ -1,3 +1,11 @@
+v1.3.6 (20 November 2016)
++ added loopback permission for boot-time filters
++ added ip:port syntax for special rules
++ added default values for new special rules
+- fixed restore listview selection
+- fixed special rules crash on delete item
+- fixed log path unexpand environment strings
+
 v1.3.5 (17 November 2016)
 - fixed configuration saving (critical)
 - fixed xml saving (critical)

diff --git a/bin/i18n/!example.txt b/bin/i18n/!example.txt
diff --git a/bin/i18n/Farsi.ini b/bin/i18n/Farsi.ini
diff --git a/bin/i18n/Korean.ini b/bin/i18n/Korean.ini
diff --git a/bin/i18n/Russian.ini b/bin/i18n/Russian.ini
diff --git a/bin/i18n/Simplified Chinese.ini b/bin/i18n/Simplified Chinese.ini
diff --git a/bin/rules.xml b/bin/rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <root>
-	<item name="SSH" rule="22" direction="0" is_block="0" is_enabled="0" />
-	<item name="Google" rule="176.222.187.0/24,173.194.0.0/16" direction="0" is_block="1" is_enabled="0" />
-	<item name="Eset NOD32" rule="91.228.166.0/23" direction="0" is_block="0" is_enabled="0" />
+	<item name="google" rule="176.222.187.0/24,173.194.0.0/16" direction="0" is_block="1" is_enabled="0" />
+	<item name="ssh port" rule="22" direction="0" is_block="0" is_enabled="0" />
+	<item name="nod32 updates" rule="91.228.166.0/23" direction="0" is_block="0" is_enabled="0" />
 </root>
diff --git a/src/main.cpp b/src/main.cpp
diff --git a/src/main.h b/src/main.h
diff --git a/src/resource.rc b/src/resource.rc