rallytime bbec183474 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/minion.py - salt/states/user.py		2016-04-15 13:58:50 -06:00
..
buildenv	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
installer	Merge branch '2015.5' into '2015.8'	2016-03-30 13:38:38 -06:00
modules	Add timelib and prereqs for compiling	2016-03-28 18:15:00 -06:00
build_env.ps1	Update pip and setuptools using req-pip.txt	2016-03-28 18:39:24 -06:00
build_pkg.bat	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
build.bat	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
portable.py	Merge branch '2015.8' into '2016.3'	2016-04-15 13:58:50 -06:00
req_pip.txt	Update pip and setuptools using req-pip.txt	2016-03-28 18:39:24 -06:00
req.txt	Add timelib and prereqs for compiling	2016-03-28 18:15:00 -06:00