Skip to content
  • mark's avatar
    GIT: Merge in foundation/master with cleanup (2016-06-14) · 376a2b66
    mark authored
    The ThirdParty repository from the Foundation now includes some
    3rd-party source code (paraview, scotch) as well.
    
    To avoid this bloat (ca. 50MB), now and in the future, it is
    unfortunately necessary to break the linear history and the direct
    connection with the Foundation repository.
    
    This commit is a squashed merge of the current Foundation master branch
    with some minor adjustments.
    
    Stop tracking of the derived README.html file.
    
    ===========================================================================
    Changes prior to merge:
    
    commit 3cb21d12be069561fbe13461440cbdf1c8b188d5
    Author: mark <mark@opencfd>
    Date:   Tue Jun 14 17:18:40 2016 +0200
    
        GIT: rationalize .gitignore
    
        - do not track derived content.
        - do track wmake files etc. (re-instates some content)
    
    commit d1bf108bea922bf60a1002c4641770b91f09f226
    Author: Henry Weller <http://cfd.direct>
    Date:   Sat Nov 7 21:44:27 2015 +0000
    
        Reinstated Qt build scripts
        Resolves bug-re...
    376a2b66