Skip to content
  • Peter Zumbruch's avatar
    merging remote github initial status, incl. README · dfd3ab13
    Peter Zumbruch authored
    Squashed commit of the following:
    
    commit 337ffef0db4d3df44176eec85ed94586f46ad00a
    Author: zumbruch <p.zumbruch@gsi.de>
    Date:   Fri Jan 9 16:42:53 2015 +0100
    
        added local log files to gitignore
    
    commit 4ff81e03b29c2ef63b2c135d1744fca1c95c1e59
    Merge: 64919fa6 e01e443f
    Author: zumbruch <p.zumbruch@gsi.de>
    Date:   Fri Jan 9 16:32:08 2015 +0100
    
        Merge remote-tracking branch 'github_pz-ssh/master' into initial_github
    
        Conflicts:
        	README
    
    commit e01e443f
    Author: zumbruch <p.zumbruch@gsi.de>
    Date:   Mon Mar 3 11:47:13 2014 +0100
    
        Update README
    
    commit cb42c4bd
    Author: zumbruch <p.zumbruch@gsi.de>
    Date:   Mon Mar 3 11:44:51 2014 +0100
    
        Update README
    
    commit 2a78d5ce
    Author: Peter Zumbruch <P.Zumbruch@gsi.de>
    Date:   Tue Nov 8 11:23:50 2011 +0100
    
        first commit
    dfd3ab13