Greg Neagle 9f7a0598dc Merge branch 'master' of https://github.com/munki/munki ...

Conflicts:
	code/client/makecatalogs

2015-01-23 11:34:56 -08:00

..

apps

Add main window frame autosave attribute to .xib and remove it from MSCMainWindowController.py; this way window frame is restored as the window is displayed instead of shortly after.

2014-12-08 10:18:24 -08:00

client

Merge branch 'master' of https://github.com/munki/munki

2015-01-23 11:34:56 -08:00

pkgtemplate

Build app pkg with preinstall script

2014-05-28 12:18:32 -07:00

server

Add MCX support, based on code contribution from Dan Roque.

2010-12-13 20:11:22 +00:00

tools

Remove '-f' from make_munki_mpkg_from_git.sh's usage message

2015-01-21 08:35:49 -08:00