[Debichem-commits] [SCM] massXpert mass spectrometry suite: debian packaging branch, debian, updated. upstream/3.2.0-1-g5564507

Thu Nov 24 21:28:55 UTC 2011

The following commit has been merged in the debian branch:
commit 5ac28f07e5ea5be295b85badb72df966c578b944
Merge: 2f74ba368af127803b036746e05272ff39e3471c 2fd9be251556d49bbed8dd3368836d656dbc494a
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Sat Jul 16 16:02:55 2011 +0200

    Merge branch 'minerStuff'
    
    Resolved conflicts.
    
    Conflicts:
    	gui/mzLabInputOligomerTableViewDlg.cpp
    	gui/mzLabInputOligomerTableViewDlg.hpp
    	gui/mzLabWnd.cpp
    	gui/mzLabWnd.hpp


-- 
massXpert mass spectrometry suite: debian packaging