Merge branch 'master' into chrome31
Conflicts: common/atom_version.h
This commit is contained in:
commit
a4715f936b
7 changed files with 42 additions and 12 deletions
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>atom.icns</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.7.5</string>
|
||||
<string>0.7.6</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue