6 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Travis Rowland	17a5cede8c	Incrementing version	2017-03-21 03:37:18 -07:00
Travis Rowland	f7bba93be3	Preserve /build/{cleanup.sh,buildconfig} files. See #188	2017-03-21 03:37:00 -07:00
Travis Rowland	6216f70411	Revert "Merge branch 'i386' into next" ... This reverts commit 34408d8013, reversing changes made to 5d80f284b0.	2017-03-21 03:15:25 -07:00
Travis Rowland	75784205cf	Merge branch 'pavlobaron-master' into next	2017-03-19 16:18:16 -07:00
Travis Rowland	d9e762730a	cleaning up getter/setter for KILL_PROCESS_TIMEOUT/KILL_ALL_PROCESSES_TIMEOUT	2017-03-19 16:17:52 -07:00
Travis Rowland	7ec5a0a65f	Merge branch 'master' of https://github.com/pavlobaron/baseimage-docker into pavlobaron-master	2017-03-19 16:15:04 -07:00