# HG changeset patch
# User jeandet
# Date 2014-06-04 19:48:57
# Node ID b8dc7b62e9e7658a5f353e100604935df4a30fb1
# Parent  f8c5117dac7c82c6964ed51adf4a096d69f1d2cc
# Parent  d2e3b72ddd07142ea1dd82bede0d5d0f2fc964b1

merge

diff --git a/src/common/common.pro b/src/common/common.pro
--- a/src/common/common.pro
+++ b/src/common/common.pro
@@ -44,10 +44,9 @@ header.files = \
     qtablewidgetintitem.h \
     srec/srecfile.h \
     srec/srecfilewidget.h \
-    abstractbinfile.h \
     BinFile/binaryfile.h \
-    BinFile/binaryfilewidget.h
-
+    BinFile/binaryfilewidget.h \
+    abstractbinfile.h
 
 win32{
     elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/libelf