xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/85' into develop

Browse Source 
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift
This commit is contained in:
Charlie Qiu
2016-10-14 23:39:11 +08:00
parent 82de054b83 1eddfd48fa
commit 91124b9e90
20 changed files with 542 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ShadowsocksX-NG/Base.lproj/MainMenu.xib
View File

@ -126,6 +126,12 @@
<action selector="editAdvPreferences:" target="Voe-Tx-rLC" id="mEF-XS-HJE"/>
</connections>
</menuItem>
<menuItem title="HTTP Proxy Preference ..." id="uEp-Gz-cu0">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="editHTTPPreferences:" target="Voe-Tx-rLC" id="tkC-e3-PH9"/>
</connections>
</menuItem>
<menuItem title="Launch At Login" id="eUq-p7-ICK">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
@ -160,5 +166,18 @@
</items>
<point key="canvasLocation" x="22" y="89"/>
</menu>
<menu id="2oY-e9-q1Z">
<items>
<menuItem title="Item 1" id="oR3-cT-RTC">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="Item 2" id="lay-XB-0oV">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="Item 3" id="m00-ru-6Po">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>
</menu>
</objects>
</document>