Skip to content

Commit

Permalink
Bump Version to 2.6.4
Browse files Browse the repository at this point in the history 
Just bump the version number and (c) year for a rebuild of the binary distribution
  • Loading branch information
@zaggo
zaggo committed Aug 28, 2016
1 parent 0cf5959 commit d40f4a9
Show file tree
Hide file tree
Showing 6 changed files with 400 additions and 1,954 deletions.
8 changes: 4 additions & 4 deletions src/Pleasant3D.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1564,8 +1564,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
APPLICATION_BUILD_NUMBER = 19;
APPLICATION_VERSION = 2.6.3;
APPLICATION_BUILD_NUMBER = 20;
APPLICATION_VERSION = 2.6.4;
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
Expand All @@ -1590,8 +1590,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
APPLICATION_BUILD_NUMBER = 19;
APPLICATION_VERSION = 2.6.3;
APPLICATION_BUILD_NUMBER = 20;
APPLICATION_VERSION = 2.6.4;
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down
12 changes: 6 additions & 6 deletions src/Resources/XIBs/en.lproj/PreferencesGeneral.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A598" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A254g" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1050" defaultVersion="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PreferencesGeneralViewController">
Expand All @@ -11,7 +11,7 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="1" userLabel="General Preferences">
<rect key="frame" x="0.0" y="0.0" width="570" height="306"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
Expand All @@ -31,4 +31,4 @@
</customView>
<userDefaultsController representsSharedInstance="YES" id="10"/>
</objects>
</document>
</document>
41 changes: 21 additions & 20 deletions src/Resources/XIBs/en.lproj/PreferencesMachines.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A598" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A254g" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1050" defaultVersion="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PreferencesMachinesViewController">
Expand All @@ -12,7 +13,7 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="1" userLabel="Printer Preferences">
<rect key="frame" x="0.0" y="0.0" width="570" height="390"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
Expand Down Expand Up @@ -43,7 +44,7 @@
<box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" id="60">
<rect key="frame" x="210" y="44" width="343" height="328"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<view key="contentView">
<view key="contentView" id="Uxa-MV-FQ7">
<rect key="frame" x="1" y="1" width="341" height="326"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
Expand Down Expand Up @@ -81,17 +82,17 @@
<string key="NSSelectorName">openMachiningQueue:</string>
</dictionary>
</binding>
<binding destination="22" name="enabled2" keyPath="selection.driver.canPrint" previousBinding="116" id="6JO-9b-uNg">
<binding destination="22" name="argument" keyPath="selectedObjects" id="169">
<dictionary key="options">
<integer key="NSNotApplicablePlaceholder" value="0"/>
<integer key="NSNoSelectionPlaceholder" value="0"/>
<integer key="NSNullPlaceholder" value="0"/>
<integer key="NSMultipleValuesPlaceholder" value="0"/>
<string key="NSSelectorName">openMachiningQueue:</string>
</dictionary>
</binding>
<binding destination="22" name="argument" keyPath="selectedObjects" id="169">
<binding destination="22" name="enabled2" keyPath="selection.driver.canPrint" previousBinding="116" id="6JO-9b-uNg">
<dictionary key="options">
<string key="NSSelectorName">openMachiningQueue:</string>
<integer key="NSMultipleValuesPlaceholder" value="0"/>
<integer key="NSNoSelectionPlaceholder" value="0"/>
<integer key="NSNotApplicablePlaceholder" value="0"/>
<integer key="NSNullPlaceholder" value="0"/>
</dictionary>
</binding>
</connections>
Expand All @@ -118,7 +119,7 @@
</connections>
</button>
<textField verticalHuggingPriority="750" id="79">
<rect key="frame" x="46" y="199" width="55" height="14"/>
<rect key="frame" x="36" y="199" width="65" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Location:" id="80">
<font key="font" metaFont="smallSystemBold"/>
Expand Down Expand Up @@ -239,12 +240,12 @@ status 2nd line</string>
<popUpButton verticalHuggingPriority="750" id="65">
<rect key="frame" x="220" y="16" width="222" height="26"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<popUpButtonCell key="cell" type="push" title="&lt;binding>" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="70" id="66">
<popUpButtonCell key="cell" type="push" title="&lt;binding&gt;" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="70" id="66">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="67">
<items>
<menuItem title="&lt;binding>" state="on" id="70"/>
<menuItem title="&lt;binding&gt;" state="on" id="70"/>
</items>
</menu>
</popUpButtonCell>
Expand Down Expand Up @@ -282,7 +283,7 @@ status 2nd line</string>
<box autoresizesSubviews="NO" title="Box" boxType="custom" borderType="none" titlePosition="noTitle" id="156">
<rect key="frame" x="0.0" y="0.0" width="180" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView">
<view key="contentView" id="RHH-gW-xsF">
<rect key="frame" x="0.0" y="0.0" width="180" height="37"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
Expand Down Expand Up @@ -346,9 +347,9 @@ status 2nd line</string>
</view>
</objects>
<resources>
<image name="NSAddTemplate" width="8" height="8"/>
<image name="NSAddTemplate" width="11" height="11"/>
<image name="NSApplicationIcon" width="128" height="128"/>
<image name="NSRemoveTemplate" width="8" height="8"/>
<image name="NSRemoveTemplate" width="11" height="11"/>
<image name="RedLight" width="16" height="16"/>
</resources>
</document>
</document>
12 changes: 6 additions & 6 deletions src/Resources/XIBs/fr.lproj/PreferencesGeneral.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A598" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A254g" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1050" defaultVersion="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PreferencesGeneralViewController">
Expand All @@ -11,7 +11,7 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="1" userLabel="General Preferences">
<rect key="frame" x="0.0" y="0.0" width="570" height="306"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
Expand Down Expand Up @@ -42,4 +42,4 @@
</customView>
<userDefaultsController representsSharedInstance="YES" id="10"/>
</objects>
</document>
</document>
Loading

0 comments on commit d40f4a9

Please sign in to comment.