Fix conflict

CharacterRun.h

@@ -61,7 +61,7 @@
 // Returns the positions for characters in the given run, which begins at the specified character
 // and x position. Returns the number of characters.
-- (int)getPositions:(CGPoint *)positions
+- (int)getPositions:(NSPoint *)positions
              forRun:(CTRunRef)run
     startingAtIndex:(int)firstCharacterIndex
          glyphCount:(int)glyphCount

CharacterRun.m

@@ -61,12 +61,12 @@ static const int kDefaultAdvancesCapacity = 100;
 }
 // Align positions into cells.
-- (int)getPositions:(CGPoint *)positions
+- (int)getPositions:(NSPoint *)positions
              forRun:(CTRunRef)run
     startingAtIndex:(int)firstCharacterIndex
          glyphCount:(int)glyphCount
         runWidthPtr:(CGFloat *)runWidthPtr {
-    const CGPoint *suggestedPositions = CTRunGetPositionsPtr(run);
+    const NSPoint *suggestedPositions = CTRunGetPositionsPtr(run);
     const CFIndex *indices = CTRunGetStringIndicesPtr(run);
     int characterIndex = firstCharacterIndex;
@@ -92,7 +92,7 @@ static const int kDefaultAdvancesCapacity = 100;
             ++numChars;
         }
         CGFloat x = basePosition + suggestedPositions[glyphIndex].x - suggestedPositions[indexOfFirstGlyphInCurrentCell].x;
-        positions[glyphIndex] = CGPointMake(x, suggestedPositions[glyphIndex].y);
+        positions[glyphIndex] = NSMakePoint(x, suggestedPositions[glyphIndex].y);
     }
     *runWidthPtr = width;
     return numChars;

PTYTextView.m

@@ -6334,7 +6334,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
         CFIndex glyphCount = CTRunGetGlyphCount(run);
         const CGGlyph *glyphs = CTRunGetGlyphsPtr(run);
-        CGPoint positions[glyphCount];
+        NSPoint positions[glyphCount];
         CGFloat runWidth;
         characterIndex += [currentRun getPositions:positions
                                             forRun:run
@@ -6342,7 +6342,6 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                                         glyphCount:glyphCount
                                        runWidthPtr:&runWidth];
-
         CTFontRef runFont =
                 CFDictionaryGetValue(CTRunGetAttributes(run), kCTFontAttributeName);

release.sh

@@ -31,10 +31,9 @@ echo Num args is $#
 COMPACTDATE=$(date +"%Y%m%d")
 VERSION=$(cat version.txt | sed -e "s/%(extra)s/$COMPACTDATE/")
 NAME=$(echo $VERSION | sed -e "s/\\./_/g")
-SVNDIR=~/svn/iterm2
+SVNDIR=~/iterm2-website
 ORIG_DIR=`pwd`
-make Deployment || exit
 ./sign.sh
 # Build tmux and move its tar.gz into the Deployment build directory
@@ -53,7 +52,7 @@ cd build/Deployment
 zip -ry iTerm2-${NAME}.zip iTerm.app
 # Update the list of changes
-vi $SVNDIR/appcasts/testing_changes.html
+vi $SVNDIR/appcasts/testing_changes.txt
 # Prepare the sparkle xml file
 SparkleSign testing.xml
@@ -77,7 +76,7 @@ echo "Go upload iTerm2-${MODERN_NAME}.zip and iTerm2-${NAME}.zip"
 echo "Then run:"
 echo "git tag v${VERSION}"
 echo "git push --tags"
-echo "pushd ${SVNDIR} && svn commit -m ${VERSION} appcasts/testing.xml appcasts/testing_changes.html appcasts/legacy_testing.xml"
+echo "pushd ${SVNDIR} && git commit -am ${VERSION} && git push origin master"
 echo "popd"
 echo "git commit -am ${VERSION}"
 echo "git push origin master"