Merge branch 'master' of ssh://aliendefender.git.sourceforge.net/gitroot/aliendefender/aliendefender

Conflicts: ADeditor/mainwindow.ui
2010-08-30 01:05:36 +04:00
parent 25dce4f32f 26439849c8
commit 183d1a45b9
17 changed files with 310 additions and 938 deletions
--- a/ADeditor/mainwindow.ui
+++ b/ADeditor/mainwindow.ui
@@ -1489,3 +1489,4 @@
 <resources/>
 <connections/>
 </ui>
+