Merge branch 'develop'

Cocoanetics · Jan 8, 2016 · 6d03c84 · 6d03c84
2 parents 8e57584 + 975919f
commit 6d03c84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
----
 language: objective-c
+osx_image: xcode7
 
+before_install:
+  - curl -sL https://gist.github.com/henrikhodne/7ac6d02ff9a24a94720c/raw/install_appledoc.sh | sh
+
 install: 
  - sudo easy_install cpp-coveralls
 

diff --git a/Core/Source/CTLineUtils.h b/Core/Source/CTLineUtils.h
@@ -6,5 +6,7 @@
 //  Copyright 2015. All rights reserved.
 //
 
+#import <CoreText/CoreText.h>
+
 BOOL areLinesEqual(CTLineRef line1, CTLineRef line2);
-CFIndex getTruncationIndex(CTLineRef line, CTLineRef trunc);
+CFIndex getTruncationIndex(CTLineRef line, CTLineRef trunc);