[audit-viewer: 3/3] Merge branch 'f14'

Miloslav Trmac mitr at fedoraproject.org
Thu Aug 26 18:27:28 UTC 2010


commit 55b5efd9c11954dff146eabafc98030d9ca589a1
Merge: d27780e dae9a8c
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Thu Aug 26 20:26:49 2010 +0200

    Merge branch 'f14'
    
    Conflicts:
    	audit-viewer.spec

 .gitignore                            |    1 +
 audit-viewer-0.6.2-chart-labels.patch |   60 ---------------------------------
 audit-viewer-0.6.2-date-field.patch   |   54 -----------------------------
 audit-viewer.spec                     |   13 +++----
 sources                               |    2 +-
 5 files changed, 7 insertions(+), 123 deletions(-)
---


More information about the scm-commits mailing list