Code

Fix context.mergeFilters#889

Code

Merged

tvandijck merged 5 commits intopremake:masterpremake/premake-core:masterfrom tdesveaux:fix-mergeFilterstdesveaux/premake-core:fix-mergeFiltersCopy head branch name to clipboardApr 14, 2018

+44-2

Commits

Commits on Sep 6, 2017

• Fix context.mergeFilters

  

  Thomas Desveaux

  committed
  4906114

  Copy full SHA for 4906114

• Merge remote-tracking branch 'core/master' into fix-mergeFilters

  

  Thomas Desveaux

  committed
  725b769

  Copy full SHA for 725b769

Commits on Apr 12, 2018

• Merge remote-tracking branch 'premake/master' into fix-mergeFilters

  

  thomas desveaux

  committed
  15829d5

  Copy full SHA for 15829d5

• Better performance on fix issue premake#884

  

  thomas desveaux

  committed
  22e36f9

  Copy full SHA for 22e36f9

Commits on Apr 13, 2018

• Remove no longer used table.joinunique

  

  Thomas Desveaux

  committed
  a8ad766

  Copy full SHA for a8ad766