Merge from trunk
[bpt/emacs.git] / nextstep / templates / Emacs.desktop.in
2012-09-17 Daniel ColascioneMerge from trunk
2012-09-16 Glenn MorrisIncrease compartmentalization of Nextstep builds rules,