onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-15 09:29:36 +02:00
Code Issues Releases Wiki Activity

resolve ChangeLog

Browse Source
This commit is contained in:
Vadim Kurland
2008-07-16 20:57:12 +00:00
parent 80b389eaf6
commit 1169013dcf
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog
+1 -4
View File
@@ -1,4 +1,4 @@
<<<<<<< .mine
2008-07-16 Vadim Kurland <vadim@vk.crocodile.org> 2008-07-16 Vadim Kurland <vadim@vk.crocodile.org>
* ipt.cpp (dumpScript): Fixed bug (no #) that triggered when * ipt.cpp (dumpScript): Fixed bug (no #) that triggered when
@@ -7,14 +7,11 @@
compiler added "( ) | ip6tables-restore" anyway which caused compiler added "( ) | ip6tables-restore" anyway which caused
syntax errors. syntax errors.
=======
2008-07-16 vadim <vadim@vk.crocodile.org>
* RuleSetView.cpp (RuleSetView::addToGroupAbove): Additional check * RuleSetView.cpp (RuleSetView::addToGroupAbove): Additional check
for a bug where adding very long list of rules to a rule group for a bug where adding very long list of rules to a rule group
caused crash once. Bug is hard to reproduce. caused crash once. Bug is hard to reproduce.
>>>>>>> .r370
2008-07-15 vadim <vadim@vk.crocodile.org> 2008-07-15 vadim <vadim@vk.crocodile.org>
* testing and bug fixes with QT 4.4. * testing and bug fixes with QT 4.4.