Ignore:
Timestamp:
04/25/13 07:18:40 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
47e969a8
Parents:
83ebbb5
Message:

Fix up the conflict details, will show what packages may be broken as a result of removing a conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-pkgmanager/mainWin.h

    rb4350b9 rb1232b5  
    103103    void uncheckAllChildrenPkgs(QString parent); 
    104104    QString getLineFromCommandOutput( QString cmd ); 
    105  
    106105    QList<QStringList> metaPkgList; 
    107106    QStringList tmpMetaPkgList; 
     
    111110    QString curFileText; 
    112111    QProcess *getMetaProc; 
     112 
     113    // NG Packages 
     114    void populateNGPkgs(); 
     115    QStringList tmpPkgList; 
     116    QStringList pkgList; 
     117    QProcess *getNGProc; 
     118 
     119 
    113120    QString chrootArg1; 
    114121    QString chrootArg2; 
Note: See TracChangeset for help on using the changeset viewer.