salt/pkg/windows
Colton Myers 9b8f6085d2 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    pkg/windows/BuildSalt.bat
    pkg/windows/installer/Salt-Minion-Setup.nsi
2015-03-20 14:39:22 -06:00
..
buildenv Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-20 14:39:22 -06:00
installer Fixed version parameter 2015-03-20 13:50:56 -06:00
BuildSalt.bat Updated BuildSalt and Salt-Minion-Setup.nsi 2015-03-20 13:48:08 -06:00