Antonio Scandurra 194f927b87 Merge branch 'master' into ns-modernize-build ...

# Conflicts:
#	build/tasks/build-task.coffee

2016-08-26 13:25:02 +02:00

..

app-icons

Configure icons based on --channel option to build task

2015-09-16 16:32:30 -07:00

linux

Start on RPM package creation

2016-08-15 16:00:33 +02:00

mac

Remove speakasy.pem from resources/mac/atom-Info.plist

2016-08-09 12:01:11 +02:00

win

Add Windows file icon

2016-08-25 22:28:48 +09:00