mirror of https://github.com/KLayout/klayout.git
git merge failed, probably because there were two parallel attempts to merge master into pymod leading to opposite resolutions. |
||
|---|---|---|
| .. | ||
| Info.plist.template | ||
| KLayoutDMG-Back.logoist | ||
| KLayoutDMG-Back.png | ||
| KLayoutDMG.applescript | ||
| KLayoutEditor.sh | ||
| KLayoutHDD.icns | ||
| KLayoutViewer.sh | ||
| klayout-blue.icns | ||
| klayout-green.icns | ||
| klayout-red.icns | ||
| klayout-yellow.icns | ||
| klayout.icns | ||
| klayoutDMGTemplate.dmg | ||
| klayout_console | ||
| qt.conf | ||
| start-console.py | ||
| template-KLayoutDMG.applescript | ||