diff options
Diffstat (limited to 'src')
37 files changed, 817 insertions, 850 deletions
diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 01cdb2b..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/*.cmx -/*.cmi -/*.cmo -/mkProjectInfo -/unison -/unison.exe -/unison-fsmonitor -/unison-fsmonitor.exe -/TAGS -/Makefile.ProjectInfo -/unison.tmproj diff --git a/src/bytearray.ml b/src/bytearray.ml index 44df2d9..60f5dcf 100644 --- a/src/bytearray.ml +++ b/src/bytearray.ml @@ -44,7 +44,7 @@ external unsafe_blit_to_string : t -> int -> string -> int -> int -> unit let to_string a = let l = length a in if l > Sys.max_string_length then invalid_arg "Bytearray.to_string" else - let s = String.create l in + let s = Bytes.create l in unsafe_blit_to_string a 0 s 0 l; s @@ -60,7 +60,7 @@ let sub a ofs len = then invalid_arg "Bytearray.sub" else begin - let s = String.create len in + let s = Bytes.create len in unsafe_blit_to_string a ofs s 0 len; s end diff --git a/src/case.ml b/src/case.ml index c366d06..3ba41e9 100644 --- a/src/case.ml +++ b/src/case.ml @@ -95,7 +95,7 @@ let hasTrailingDots s = let removeTrailingDots s = let len = String.length s in - let s' = String.create len in + let s' = Bytes.create len in let pos = ref (len - 1) in let pos' = ref (len - 1) in while !pos >= 0 do diff --git a/src/fileutil.ml b/src/fileutil.ml index 79390aa..ddff30b 100644 --- a/src/fileutil.ml +++ b/src/fileutil.ml @@ -21,12 +21,12 @@ let backslashes2forwardslashes s0 = try ignore(String.index s0 '\\'); (* avoid alloc if possible *) let n = String.length s0 in - let s = String.create n in + let s = Bytes.create n in for i = 0 to n-1 do let c = String.get s0 i in if c = '\\' - then String.set s i '/' - else String.set s i c + then Bytes.set s i '/' + else Bytes.set s i c done; s with Not_found -> s0 diff --git a/src/fingerprint.ml b/src/fingerprint.ml index 21a9099..cb03c44 100644 --- a/src/fingerprint.ml +++ b/src/fingerprint.ml @@ -75,7 +75,7 @@ let hexaCode theChar = let toString md5 = if ispseudo md5 then md5 else begin let length = String.length md5 in - let string = String.create (length * 2) in + let string = Bytes.create (length * 2) in for i=0 to (length - 1) do let c1, c2 = hexaCode (md5.[i]) in string.[2*i] <- c1; diff --git a/src/fpcache.ml b/src/fpcache.ml index 7492802..d3fce4f 100644 --- a/src/fpcache.ml +++ b/src/fpcache.ml @@ -50,7 +50,7 @@ let state = ref None let decompress st i path = let l = String.length path in - let s = String.create (l + i) in + let s = Bytes.create (l + i) in String.blit !st 0 s 0 i; String.blit path 0 s i l; st := s; @@ -74,14 +74,14 @@ let read st ic = let fp1 = Digest.input ic in let fp2 = Digest.input ic in let headerSize = Marshal.header_size in - let header = String.create headerSize in + let header = Bytes.create headerSize in really_input ic header 0 headerSize; if fp1 <> Digest.string header then begin debug (fun () -> Util.msg "bad header checksum\n"); raise End_of_file end; let dataSize = Marshal.data_size header 0 in - let s = String.create (headerSize + dataSize) in + let s = Bytes.create (headerSize + dataSize) in String.blit header 0 s 0 headerSize; really_input ic s headerSize dataSize; if fp2 <> Digest.string s then begin diff --git a/src/fsmonitor/.gitignore b/src/fsmonitor/.gitignore deleted file mode 100644 index 4081335..0000000 --- a/src/fsmonitor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.cm[ix] diff --git a/src/fsmonitor/linux/.gitignore b/src/fsmonitor/linux/.gitignore deleted file mode 100644 index 4081335..0000000 --- a/src/fsmonitor/linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.cm[ix] diff --git a/src/fsmonitor/watchercommon.ml b/src/fsmonitor/watchercommon.ml index b274a64..c6b9ebf 100644 --- a/src/fsmonitor/watchercommon.ml +++ b/src/fsmonitor/watchercommon.ml @@ -46,7 +46,7 @@ let quote s = let n = ref 0 in for i = 0 to l - 1 do if disallowed_char s.[i] then incr n done; if !n = 0 then s else begin - let q = String.create (l + 2 * !n) in + let q = Bytes.create (l + 2 * !n) in let j = ref 0 in let hex = "0123456789ABCDEF" in for i = 0 to l - 1 do @@ -76,7 +76,7 @@ let unquote s = | 'A'..'F' -> Char.code c - Char.code 'A' + 10 | _ -> invalid_arg "unquote" in - let u = String.create (l - 2 * !n) in + let u = Bytes.create (l - 2 * !n) in let j = ref 0 in for i = 0 to l - 2 * !n - 1 do let c = s.[!j] in @@ -130,7 +130,7 @@ let printf fmt = let read_line = let b = Buffer.create 160 in - let buf = String.create 160 in + let buf = Bytes.create 160 in let start = ref 0 in let last = ref 0 in let rec read_line () = diff --git a/src/fsmonitor/windows/.gitignore b/src/fsmonitor/windows/.gitignore deleted file mode 100644 index 4081335..0000000 --- a/src/fsmonitor/windows/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.cm[ix] diff --git a/src/fspath.ml b/src/fspath.ml index 92ee31c..fc06877 100644 --- a/src/fspath.ml +++ b/src/fspath.ml @@ -92,7 +92,7 @@ let appleDouble (Fspath f) = let len = String.length f in try let i = 1 + String.rindex f '/' in - let res = String.create (len + 2) in + let res = Bytes.create (len + 2) in String.blit f 0 res 0 i; res.[i] <- '.'; res.[i + 1] <- '_'; @@ -192,7 +192,7 @@ let concat fspath path = let p = Path.toString path in let l = String.length fspath in let l' = String.length p in - let s = String.create (l + l' + 1) in + let s = Bytes.create (l + l' + 1) in String.blit fspath 0 s 0 l; s.[l] <- '/'; String.blit p 0 s (l + 1) l'; diff --git a/src/fswatch.ml b/src/fswatch.ml index dd8169e..9d46a6f 100644 --- a/src/fswatch.ml +++ b/src/fswatch.ml @@ -110,7 +110,7 @@ let quote s = let n = ref 0 in for i = 0 to l - 1 do if disallowed_char s.[i] then incr n done; if !n = 0 then s else begin - let q = String.create (l + 2 * !n) in + let q = Bytes.create (l + 2 * !n) in let j = ref 0 in let hex = "0123456789ABCDEF" in for i = 0 to l - 1 do @@ -140,7 +140,7 @@ let unquote s = | 'A'..'F' -> Char.code c - Char.code 'A' + 10 | _ -> invalid_arg "unquote" in - let u = String.create (l - 2 * !n) in + let u = Bytes.create (l - 2 * !n) in let j = ref 0 in for i = 0 to l - 2 * !n - 1 do let c = s.[!j] in @@ -189,7 +189,7 @@ let printf o fmt = let read_line i = let b = Buffer.create 160 in - let buf = String.create 160 in + let buf = Bytes.create 160 in let start = ref 0 in let last = ref 0 in let rec read () = diff --git a/src/lwt/.gitignore b/src/lwt/.gitignore deleted file mode 100644 index 64fdfe2..0000000 --- a/src/lwt/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/*.cmx -/*.cmi -/*.cmo -/*.cma diff --git a/src/lwt/example/relay.ml b/src/lwt/example/relay.ml index 77be87c..9cdd337 100644 --- a/src/lwt/example/relay.ml +++ b/src/lwt/example/relay.ml @@ -18,7 +18,7 @@ let rec really_write out_ch buffer pos len = let relay in_ch out_ch = let rec relay_rec previous_write = - let buffer = String.create 8192 in + let buffer = Bytes.create 8192 in (* Read some data from the input socket *) Lwt_unix.read in_ch buffer 0 8192 >>= (fun len -> (* If we read nothing, this means that the connection has been diff --git a/src/lwt/generic/.gitignore b/src/lwt/generic/.gitignore deleted file mode 100644 index 6c55acc..0000000 --- a/src/lwt/generic/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/*.cmx -/*.cmi -/*.cmo diff --git a/src/lwt/generic/lwt_unix_impl.ml b/src/lwt/generic/lwt_unix_impl.ml index 09f007a..1c16cf3 100644 --- a/src/lwt/generic/lwt_unix_impl.ml +++ b/src/lwt/generic/lwt_unix_impl.ml @@ -369,11 +369,11 @@ let really_input ic s ofs len = else unsafe_really_input ic s ofs len let input_line ic = - let buf = ref (String.create 128) in + let buf = ref (Bytes.create 128) in let pos = ref 0 in let rec loop () = if !pos = String.length !buf then begin - let newbuf = String.create (2 * !pos) in + let newbuf = Bytes.create (2 * !pos) in String.blit !buf 0 newbuf 0 !pos; buf := newbuf end; @@ -395,7 +395,7 @@ let input_line ic = | _ -> Lwt.fail e)) (fun () -> - let res = String.create !pos in + let res = Bytes.create !pos in String.blit !buf 0 res 0 !pos; Lwt.return res) diff --git a/src/lwt/win/.gitignore b/src/lwt/win/.gitignore deleted file mode 100644 index 6c55acc..0000000 --- a/src/lwt/win/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/*.cmx -/*.cmi -/*.cmo diff --git a/src/lwt/win/lwt_unix_impl.ml b/src/lwt/win/lwt_unix_impl.ml index 63f9b3c..7ee9082 100644 --- a/src/lwt/win/lwt_unix_impl.ml +++ b/src/lwt/win/lwt_unix_impl.ml @@ -500,11 +500,11 @@ let really_input ic s ofs len = else unsafe_really_input ic s ofs len let input_line ic = - let buf = ref (String.create 128) in + let buf = ref (Bytes.create 128) in let pos = ref 0 in let rec loop () = if !pos = String.length !buf then begin - let newbuf = String.create (2 * !pos) in + let newbuf = Bytes.create (2 * !pos) in String.blit !buf 0 newbuf 0 !pos; buf := newbuf end; @@ -526,7 +526,7 @@ let input_line ic = | _ -> Lwt.fail e)) (fun () -> - let res = String.create !pos in + let res = Bytes.create !pos in String.blit !buf 0 res 0 !pos; Lwt.return res) *) diff --git a/src/mkProjectInfo.ml b/src/mkProjectInfo.ml index 6e8d7b9..9474cc7 100644 --- a/src/mkProjectInfo.ml +++ b/src/mkProjectInfo.ml @@ -42,10 +42,8 @@ let pointVersionOrigin = 543 (* Revision that corresponds to point version 0 *) (* ---------------------------------------------------------------------- *) (* You shouldn't need to edit below. *) -let revisionString = "$Rev$";; - -let pointVersion = - Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;; +let revisionString = "2.49.543";; +let pointVersion = 543;; Printf.printf "MAJORVERSION=%d.%d\n" majorVersion minorVersion;; Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;; @@ -108,7 +108,7 @@ let getID buf ofs = | _ -> `UNKNOWN let setInt4 v = - let s = String.create 4 in + let s = Bytes.create 4 in let set i = s.[i] <- Char.chr (Int64.to_int (Int64.logand 255L @@ -126,7 +126,7 @@ let fail dataFspath dataPath doubleFspath msg = (Fspath.toPrintString (Fspath.concat dataFspath dataPath)) msg)) let readDouble dataFspath dataPath doubleFspath inch len = - let buf = String.create len in + let buf = Bytes.create len in begin try really_input inch buf 0 len with End_of_file -> @@ -267,7 +267,7 @@ let getFileInfos dataFspath dataPath typ = protect (fun () -> LargeFile.seek_in inch (Int64.add offset 16L); let len = String.length resource_fork_empty_tag in - let buf = String.create len in + let buf = Bytes.create len in really_input inch buf 0 len; buf = resource_fork_empty_tag) (fun () -> close_in_noerr inch) diff --git a/src/path.ml b/src/path.ml index 827fd40..96657f2 100644 --- a/src/path.ml +++ b/src/path.ml @@ -30,7 +30,7 @@ let concat p p' = if l = 0 then p' else let l' = String.length p' in if l' = 0 then p else - let p'' = String.create (l + l' + 1) in + let p'' = Bytes.create (l + l' + 1) in String.blit p 0 p'' 0 l; p''.[l] <- pathSeparatorChar; String.blit p' 0 p'' (l + 1) l'; @@ -201,7 +201,7 @@ let addPrefixToFinalName path prefix = let i = String.rindex path pathSeparatorChar + 1 in let l = String.length path in let l' = String.length prefix in - let p = String.create (l + l') in + let p = Bytes.create (l + l') in String.blit path 0 p 0 i; String.blit prefix 0 p i l'; String.blit path i p (i + l') (l - i); diff --git a/src/remote.ml b/src/remote.ml index 37efd0d..1c70add 100644 --- a/src/remote.ml +++ b/src/remote.ml @@ -125,7 +125,7 @@ let bufferSize = 16384 buffer of this size *) let makeBuffer ch = - { channel = ch; buffer = String.create bufferSize; + { channel = ch; buffer = Bytes.create bufferSize; length = 0; opened = true } (****) diff --git a/src/system/.gitignore b/src/system/.gitignore deleted file mode 100644 index 14a8ee2..0000000 --- a/src/system/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/*.cmi -/*.cmo -/*.cmx diff --git a/src/system/generic/.gitignore b/src/system/generic/.gitignore deleted file mode 100644 index 14a8ee2..0000000 --- a/src/system/generic/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/*.cmi -/*.cmo -/*.cmx diff --git a/src/system/win/.gitignore b/src/system/win/.gitignore deleted file mode 100644 index 6c55acc..0000000 --- a/src/system/win/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/*.cmx -/*.cmi -/*.cmo diff --git a/src/terminal.ml b/src/terminal.ml index 2e3fe6b..ea8f849 100644 --- a/src/terminal.ml +++ b/src/terminal.ml @@ -222,7 +222,7 @@ let (>>=) = Lwt.bind (* Wait until there is input. If there is terminal input s, return Some s. Otherwise, return None. *) let rec termInput fdTerm fdInput = - let buf = String.create 10000 in + let buf = Bytes.create 10000 in let rec readPrompt () = Lwt_unix.read fdTerm buf 0 10000 >>= fun len -> if len = 0 then @@ -244,7 +244,7 @@ let rec termInput fdTerm fdInput = (* Read messages from the terminal and use the callback to get an answer *) let handlePasswordRequests fdTerm callback = - let buf = String.create 10000 in + let buf = Bytes.create 10000 in let rec loop () = Lwt_unix.read fdTerm buf 0 10000 >>= (fun len -> if len = 0 then diff --git a/src/test.ml b/src/test.ml index 03dd5cb..b9c926d 100644 --- a/src/test.ml +++ b/src/test.ml @@ -48,7 +48,7 @@ let rec remove_file_or_dir d = let read_chan chan = let nbytes = in_channel_length chan in - let string = String.create nbytes in + let string = Bytes.create nbytes in really_input chan string 0 nbytes; string diff --git a/src/transfer.ml b/src/transfer.ml index 4af0243..a0305bf 100644 --- a/src/transfer.ml +++ b/src/transfer.ml @@ -261,7 +261,7 @@ let send infd length showProgress transmit = let timer = Trace.startTimer "Sending file using generic transmission" in let bufSz = 8192 in let bufSzFS = Uutil.Filesize.ofInt 8192 in - let buf = String.create bufSz in + let buf = Bytes.create bufSz in let q = makeQueue 0 in let rec sendSlice length = if length > Uutil.Filesize.zero then begin @@ -373,7 +373,7 @@ struct and eventually handles the buffer update. *) let blockIter infd f blockSize maxCount = let bufferSize = 8192 + blockSize in - let buffer = String.create bufferSize in + let buffer = Bytes.create bufferSize in let rec iter count offset length = if count = maxCount then count @@ -454,7 +454,7 @@ struct (* For each transfer instruction, either output a string or copy one or several blocks from the old file. *) let rsyncDecompress blockSize infd outfd showProgress (data, pos, len) = - let decomprBuf = String.create decomprBufSize in + let decomprBuf = Bytes.create decomprBufSize in let progress = ref 0 in let rec copy length = if length > decomprBufSize then begin @@ -712,7 +712,7 @@ struct in (* Create the compression buffer *) - let comprBuf = String.create comprBufSize in + let comprBuf = Bytes.create comprBufSize in (* If there is data waiting to be sent, transmit it as a STRING token *) let transmitString toBeSent offset = diff --git a/src/ubase/.gitignore b/src/ubase/.gitignore deleted file mode 100644 index bb29d52..0000000 --- a/src/ubase/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/*.cmx -/*.cmi -/*.cmo -/projectInfo.ml -/depend diff --git a/src/uicommon.ml b/src/uicommon.ml index f0cbf40..5204605 100644 --- a/src/uicommon.ml +++ b/src/uicommon.ml @@ -359,7 +359,7 @@ let dangerousPathMsg dangerousPaths = let quote s = let len = String.length s in - let buf = String.create (2 * len) in + let buf = Bytes.create (2 * len) in let pos = ref 0 in for i = 0 to len - 1 do match s.[i] with diff --git a/src/uimac14/Info.plist b/src/uimac14/Info.plist index c5326f9..e8c14a5 100644 --- a/src/uimac14/Info.plist +++ b/src/uimac14/Info.plist @@ -2,31 +2,31 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>CFBundleName</key> - <string>Unison</string> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>Unison</string> - <key>CFBundleIconFile</key> - <string>Unison.icns</string> - <key>CFBundleIdentifier</key> - <string>edu.upenn.cis.Unison</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleShortVersionString</key> - <string>$(MARKETING_VERSION)</string> - <key>CFBundleGetInfoString</key> - <string>${MARKETING_VERSION}, ©1999-2016, licensed under GNU GPL.</string> - <key>NSHumanReadableCopyright</key> - <string>©1999-2016, licensed under GNU GPL v3.</string> - <key>NSMainNibFile</key> - <string>MainMenu</string> - <key>NSPrincipalClass</key> - <string>NSApplication</string> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>Unison</string> + <key>CFBundleGetInfoString</key> + <string>${MARKETING_VERSION}, ©1999-2016, licensed under GNU GPL.</string> + <key>CFBundleIconFile</key> + <string>Unison.icns</string> + <key>CFBundleIdentifier</key> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Unison</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>$(MARKETING_VERSION)</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>NSHumanReadableCopyright</key> + <string>©1999-2016, licensed under GNU GPL v3.</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> </dict> </plist> diff --git a/src/uimac14/uimacnew.xcodeproj/project.pbxproj b/src/uimac14/uimacnew.xcodeproj/project.pbxproj index d6f0940..6c49407 100644 --- a/src/uimac14/uimacnew.xcodeproj/project.pbxproj +++ b/src/uimac14/uimacnew.xcodeproj/project.pbxproj @@ -1,784 +1,795 @@ // !$*UTF8*$! { - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { + archiveVersion = 1; + classes = { + }; + objectVersion = 47; + objects = { /* Begin PBXAggregateTarget section */ - 2A124E780DE1C48400524237 /* Create ExternalSettings */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */; - buildPhases = ( - 2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */, - ); - dependencies = ( - ); - name = "Create ExternalSettings"; - productName = "Create ExternalSettings"; - }; + 2A124E780DE1C48400524237 /* Create ExternalSettings */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */; + buildPhases = ( + 2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */, + ); + dependencies = ( + ); + name = "Create ExternalSettings"; + productName = "Create ExternalSettings"; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A3C3F7B09922D4900E404E9 /* NotificationController.m */; }; - 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E282CC70D9AE2B000439D01 /* unison-blob.o */; }; - 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */; }; - 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */; }; - 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */; }; - 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */; }; - 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */; }; - 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */; }; - 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */; }; - 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */; }; - 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */; }; - 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */; }; - 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */; }; - 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */; }; - 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */; }; - 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */; }; - 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */; }; - 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */; }; - 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */; }; - 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29260BFA5C1200E4E641 /* Outline-Flat.png */; }; - 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */; }; - 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */; }; - 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 449F03DF0BE00DE9003F15C8 /* Bridge.m */; }; - 44A794A10BE16C380069680C /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44A794A00BE16C380069680C /* ExceptionHandling.framework */; }; - 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 44A797F10BE3F9B70069680C /* table-mixed.tif */; }; - 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */ = {isa = PBXBuildFile; fileRef = 44F472AF0C0DB735006428EF /* Change_Absent.png */; }; - 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */ = {isa = PBXBuildFile; fileRef = 44F472B00C0DB735006428EF /* Change_Unmodified.png */; }; - 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; - 69C625E80664EC3300B3C46A /* Unison.icns in Resources */ = {isa = PBXBuildFile; fileRef = 69C625CA0664E94E00B3C46A /* Unison.icns */; }; - 69C625EA0664EC3300B3C46A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; - 69C625EB0664EC3300B3C46A /* MyController.m in Sources */ = {isa = PBXBuildFile; fileRef = 69660DC704F08CC100CF23A4 /* MyController.m */; }; - 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */ = {isa = PBXBuildFile; fileRef = 690F564504F11EC300CF23A4 /* ProfileController.m */; }; - 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */; }; - 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 69BA7DA904FD695200CF23A4 /* ReconTableView.m */; }; - 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 697985CE050CFA2D00CF23A4 /* PreferencesController.m */; }; - 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 691CE181051BB44A00CF23A4 /* ProfileTableView.m */; }; - 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69E407B907EB95AA00D37AA1 /* Security.framework */; }; - 8450B1381918859E00A2C4D6 /* ColorGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8450B1371918859E00A2C4D6 /* ColorGradientView.m */; }; - 849BE4FF191AC10E001B6FBF /* README in Resources */ = {isa = PBXBuildFile; fileRef = 849BE4FA191AC10E001B6FBF /* README */; }; - 849BE500191AC10E001B6FBF /* SSSelectableToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */; }; - 849BE501191AC10E001B6FBF /* SSSelectableToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */; }; - B518071C09D6652100B1B21F /* add.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071209D6652100B1B21F /* add.tif */; }; - B518071D09D6652100B1B21F /* diff.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071309D6652100B1B21F /* diff.tif */; }; - B518071E09D6652100B1B21F /* go.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071409D6652100B1B21F /* go.tif */; }; - B518071F09D6652100B1B21F /* left.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071509D6652100B1B21F /* left.tif */; }; - B518072009D6652100B1B21F /* merge.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071609D6652100B1B21F /* merge.tif */; }; - B518072109D6652100B1B21F /* quit.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071709D6652100B1B21F /* quit.tif */; }; - B518072209D6652100B1B21F /* restart.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071809D6652100B1B21F /* restart.tif */; }; - B518072309D6652100B1B21F /* right.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071909D6652100B1B21F /* right.tif */; }; - B518072409D6652100B1B21F /* save.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071A09D6652100B1B21F /* save.tif */; }; - B518072509D6652100B1B21F /* skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071B09D6652100B1B21F /* skip.tif */; }; - B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */; }; - B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1109DF61A4000DC7AF /* table-conflict.tif */; }; - B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1209DF61A4000DC7AF /* table-error.tif */; }; - B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */; }; - B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1409DF61A4000DC7AF /* table-left-green.tif */; }; - B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1509DF61A4000DC7AF /* table-merge.tif */; }; - B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */; }; - B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1709DF61A4000DC7AF /* table-right-green.tif */; }; - B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1809DF61A4000DC7AF /* table-skip.tif */; }; - B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5E03B3809E38B9E0058C7B9 /* rescan.tif */; }; - DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE2444D410C294EA007E1546 /* MainMenu.xib */; }; + 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A3C3F7B09922D4900E404E9 /* NotificationController.m */; }; + 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E282CC70D9AE2B000439D01 /* unison-blob.o */; }; + 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */; }; + 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */; }; + 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */; }; + 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */; }; + 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */; }; + 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */; }; + 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */; }; + 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */; }; + 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */; }; + 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */; }; + 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */; }; + 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */; }; + 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */; }; + 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */; }; + 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */; }; + 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */; }; + 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */; }; + 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29260BFA5C1200E4E641 /* Outline-Flat.png */; }; + 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */; }; + 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */; }; + 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 449F03DF0BE00DE9003F15C8 /* Bridge.m */; }; + 44A794A10BE16C380069680C /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44A794A00BE16C380069680C /* ExceptionHandling.framework */; }; + 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 44A797F10BE3F9B70069680C /* table-mixed.tif */; }; + 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */ = {isa = PBXBuildFile; fileRef = 44F472AF0C0DB735006428EF /* Change_Absent.png */; }; + 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */ = {isa = PBXBuildFile; fileRef = 44F472B00C0DB735006428EF /* Change_Unmodified.png */; }; + 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; + 69C625E80664EC3300B3C46A /* Unison.icns in Resources */ = {isa = PBXBuildFile; fileRef = 69C625CA0664E94E00B3C46A /* Unison.icns */; }; + 69C625EA0664EC3300B3C46A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; + 69C625EB0664EC3300B3C46A /* MyController.m in Sources */ = {isa = PBXBuildFile; fileRef = 69660DC704F08CC100CF23A4 /* MyController.m */; }; + 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */ = {isa = PBXBuildFile; fileRef = 690F564504F11EC300CF23A4 /* ProfileController.m */; }; + 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */; }; + 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 69BA7DA904FD695200CF23A4 /* ReconTableView.m */; }; + 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 697985CE050CFA2D00CF23A4 /* PreferencesController.m */; }; + 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 691CE181051BB44A00CF23A4 /* ProfileTableView.m */; }; + 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69E407B907EB95AA00D37AA1 /* Security.framework */; }; + 8450B1381918859E00A2C4D6 /* ColorGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8450B1371918859E00A2C4D6 /* ColorGradientView.m */; }; + 849BE4FF191AC10E001B6FBF /* README in Resources */ = {isa = PBXBuildFile; fileRef = 849BE4FA191AC10E001B6FBF /* README */; }; + 849BE500191AC10E001B6FBF /* SSSelectableToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */; }; + 849BE501191AC10E001B6FBF /* SSSelectableToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */; }; + B518071C09D6652100B1B21F /* add.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071209D6652100B1B21F /* add.tif */; }; + B518071D09D6652100B1B21F /* diff.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071309D6652100B1B21F /* diff.tif */; }; + B518071E09D6652100B1B21F /* go.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071409D6652100B1B21F /* go.tif */; }; + B518071F09D6652100B1B21F /* left.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071509D6652100B1B21F /* left.tif */; }; + B518072009D6652100B1B21F /* merge.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071609D6652100B1B21F /* merge.tif */; }; + B518072109D6652100B1B21F /* quit.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071709D6652100B1B21F /* quit.tif */; }; + B518072209D6652100B1B21F /* restart.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071809D6652100B1B21F /* restart.tif */; }; + B518072309D6652100B1B21F /* right.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071909D6652100B1B21F /* right.tif */; }; + B518072409D6652100B1B21F /* save.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071A09D6652100B1B21F /* save.tif */; }; + B518072509D6652100B1B21F /* skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071B09D6652100B1B21F /* skip.tif */; }; + B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */; }; + B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1109DF61A4000DC7AF /* table-conflict.tif */; }; + B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1209DF61A4000DC7AF /* table-error.tif */; }; + B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */; }; + B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1409DF61A4000DC7AF /* table-left-green.tif */; }; + B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1509DF61A4000DC7AF /* table-merge.tif */; }; + B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */; }; + B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1709DF61A4000DC7AF /* table-right-green.tif */; }; + B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1809DF61A4000DC7AF /* table-skip.tif */; }; + B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5E03B3809E38B9E0058C7B9 /* rescan.tif */; }; + DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE2444D410C294EA007E1546 /* MainMenu.xib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 2A124E7F0DE1C4E400524237 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 2A124E780DE1C48400524237; - remoteInfo = "Create ExternalSettings"; - }; + 2A124E7F0DE1C4E400524237 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 2A124E780DE1C48400524237; + remoteInfo = "Create ExternalSettings"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 2A3C3F3709922AA600E404E9 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - BB6E50CF10CAA57600E23F8A /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 2A3C3F3709922AA600E404E9 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + BB6E50CF10CAA57600E23F8A /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; - 2A3C3F7A09922D4900E404E9 /* NotificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationController.h; sourceTree = "<group>"; }; - 2A3C3F7B09922D4900E404E9 /* NotificationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationController.m; sourceTree = "<group>"; }; - 2E282CC70D9AE2B000439D01 /* unison-blob.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = "unison-blob.o"; path = "../unison-blob.o"; sourceTree = SOURCE_ROOT; }; - 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ExternalSettings.xcconfig; sourceTree = "<group>"; }; - 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProgressCell.h; sourceTree = "<group>"; }; - 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProgressCell.m; sourceTree = "<group>"; }; - 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarAdvanced.png; path = progressicons/ProgressBarAdvanced.png; sourceTree = "<group>"; }; - 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = progressicons/ProgressBarBlue.png; sourceTree = "<group>"; }; - 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndAdvanced.png; path = progressicons/ProgressBarEndAdvanced.png; sourceTree = "<group>"; }; - 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndBlue.png; path = progressicons/ProgressBarEndBlue.png; sourceTree = "<group>"; }; - 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = progressicons/ProgressBarEndGray.png; sourceTree = "<group>"; }; - 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGreen.png; path = progressicons/ProgressBarEndGreen.png; sourceTree = "<group>"; }; - 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndWhite.png; path = progressicons/ProgressBarEndWhite.png; sourceTree = "<group>"; }; - 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGray.png; path = progressicons/ProgressBarGray.png; sourceTree = "<group>"; }; - 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGreen.png; path = progressicons/ProgressBarGreen.png; sourceTree = "<group>"; }; - 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarLightGreen.png; path = progressicons/ProgressBarLightGreen.png; sourceTree = "<group>"; }; - 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = progressicons/ProgressBarWhite.png; sourceTree = "<group>"; }; - 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Created.png; sourceTree = "<group>"; }; - 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Deleted.png; sourceTree = "<group>"; }; - 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Modified.png; sourceTree = "<group>"; }; - 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_PropsChanged.png; sourceTree = "<group>"; }; - 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Deep.png"; sourceTree = "<group>"; }; - 445A29260BFA5C1200E4E641 /* Outline-Flat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Flat.png"; sourceTree = "<group>"; }; - 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Flattened.png"; sourceTree = "<group>"; }; - 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageAndTextCell.h; sourceTree = "<group>"; }; - 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ImageAndTextCell.m; sourceTree = "<group>"; }; - 449F03DE0BE00DE9003F15C8 /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = "<group>"; }; - 449F03DF0BE00DE9003F15C8 /* Bridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Bridge.m; sourceTree = "<group>"; }; - 44A794A00BE16C380069680C /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; }; - 44A797F10BE3F9B70069680C /* table-mixed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-mixed.tif"; sourceTree = "<group>"; }; - 44F472AF0C0DB735006428EF /* Change_Absent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Absent.png; sourceTree = "<group>"; }; - 44F472B00C0DB735006428EF /* Change_Unmodified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Unmodified.png; sourceTree = "<group>"; }; - 690F564404F11EC300CF23A4 /* ProfileController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProfileController.h; sourceTree = "<group>"; }; - 690F564504F11EC300CF23A4 /* ProfileController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProfileController.m; sourceTree = "<group>"; }; - 691CE180051BB44A00CF23A4 /* ProfileTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProfileTableView.h; sourceTree = "<group>"; }; - 691CE181051BB44A00CF23A4 /* ProfileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProfileTableView.m; sourceTree = "<group>"; }; - 69660DC604F08CC100CF23A4 /* MyController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyController.h; sourceTree = "<group>"; }; - 69660DC704F08CC100CF23A4 /* MyController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MyController.m; sourceTree = "<group>"; }; - 697985CD050CFA2D00CF23A4 /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; }; - 697985CE050CFA2D00CF23A4 /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; }; - 69BA7DA804FD695200CF23A4 /* ReconTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReconTableView.h; sourceTree = "<group>"; }; - 69BA7DA904FD695200CF23A4 /* ReconTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReconTableView.m; sourceTree = "<group>"; }; - 69C625CA0664E94E00B3C46A /* Unison.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Unison.icns; sourceTree = "<group>"; }; - 69C625F40664EC3300B3C46A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; - 69C625F50664EC3300B3C46A /* Unison.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Unison.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ReconItem.m; sourceTree = "<group>"; }; - 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ReconItem.h; sourceTree = "<group>"; }; - 69E407B907EB95AA00D37AA1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; - 8450B1361918859E00A2C4D6 /* ColorGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorGradientView.h; sourceTree = "<group>"; }; - 8450B1371918859E00A2C4D6 /* ColorGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorGradientView.m; sourceTree = "<group>"; }; - 849BE4FA191AC10E001B6FBF /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; - 849BE4FB191AC10E001B6FBF /* SSSelectableToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSelectableToolbar.h; sourceTree = "<group>"; }; - 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSSelectableToolbar.m; sourceTree = "<group>"; }; - 849BE4FD191AC10E001B6FBF /* SSSelectableToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSelectableToolbarItem.h; sourceTree = "<group>"; }; - 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSSelectableToolbarItem.m; sourceTree = "<group>"; }; - B518071209D6652100B1B21F /* add.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = add.tif; sourceTree = "<group>"; }; - B518071309D6652100B1B21F /* diff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = diff.tif; sourceTree = "<group>"; }; - B518071409D6652100B1B21F /* go.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = go.tif; sourceTree = "<group>"; }; - B518071509D6652100B1B21F /* left.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = left.tif; sourceTree = "<group>"; }; - B518071609D6652100B1B21F /* merge.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = merge.tif; sourceTree = "<group>"; }; - B518071709D6652100B1B21F /* quit.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = quit.tif; sourceTree = "<group>"; }; - B518071809D6652100B1B21F /* restart.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = restart.tif; sourceTree = "<group>"; }; - B518071909D6652100B1B21F /* right.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = right.tif; sourceTree = "<group>"; }; - B518071A09D6652100B1B21F /* save.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = save.tif; sourceTree = "<group>"; }; - B518071B09D6652100B1B21F /* skip.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = skip.tif; sourceTree = "<group>"; }; - B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UnisonToolbar.h; sourceTree = "<group>"; }; - B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UnisonToolbar.m; sourceTree = "<group>"; }; - B5B44C1109DF61A4000DC7AF /* table-conflict.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-conflict.tif"; sourceTree = "<group>"; }; - B5B44C1209DF61A4000DC7AF /* table-error.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-error.tif"; sourceTree = "<group>"; }; - B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-blue.tif"; sourceTree = "<group>"; }; - B5B44C1409DF61A4000DC7AF /* table-left-green.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-green.tif"; sourceTree = "<group>"; }; - B5B44C1509DF61A4000DC7AF /* table-merge.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-merge.tif"; sourceTree = "<group>"; }; - B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-right-blue.tif"; sourceTree = "<group>"; }; - B5B44C1709DF61A4000DC7AF /* table-right-green.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-right-green.tif"; sourceTree = "<group>"; }; - B5B44C1809DF61A4000DC7AF /* table-skip.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-skip.tif"; sourceTree = "<group>"; }; - B5E03B3809E38B9E0058C7B9 /* rescan.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = rescan.tif; sourceTree = "<group>"; }; - DE2444D510C294EA007E1546 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; }; + 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; + 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; + 2A3C3F7A09922D4900E404E9 /* NotificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationController.h; sourceTree = "<group>"; }; + 2A3C3F7B09922D4900E404E9 /* NotificationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationController.m; sourceTree = "<group>"; }; + 2E282CC70D9AE2B000439D01 /* unison-blob.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = "unison-blob.o"; path = "../unison-blob.o"; sourceTree = SOURCE_ROOT; }; + 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ExternalSettings.xcconfig; sourceTree = "<group>"; }; + 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProgressCell.h; sourceTree = "<group>"; }; + 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProgressCell.m; sourceTree = "<group>"; }; + 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarAdvanced.png; path = progressicons/ProgressBarAdvanced.png; sourceTree = "<group>"; }; + 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = progressicons/ProgressBarBlue.png; sourceTree = "<group>"; }; + 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndAdvanced.png; path = progressicons/ProgressBarEndAdvanced.png; sourceTree = "<group>"; }; + 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndBlue.png; path = progressicons/ProgressBarEndBlue.png; sourceTree = "<group>"; }; + 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = progressicons/ProgressBarEndGray.png; sourceTree = "<group>"; }; + 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGreen.png; path = progressicons/ProgressBarEndGreen.png; sourceTree = "<group>"; }; + 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndWhite.png; path = progressicons/ProgressBarEndWhite.png; sourceTree = "<group>"; }; + 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGray.png; path = progressicons/ProgressBarGray.png; sourceTree = "<group>"; }; + 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGreen.png; path = progressicons/ProgressBarGreen.png; sourceTree = "<group>"; }; + 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarLightGreen.png; path = progressicons/ProgressBarLightGreen.png; sourceTree = "<group>"; }; + 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = progressicons/ProgressBarWhite.png; sourceTree = "<group>"; }; + 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Created.png; sourceTree = "<group>"; }; + 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Deleted.png; sourceTree = "<group>"; }; + 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Modified.png; sourceTree = "<group>"; }; + 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_PropsChanged.png; sourceTree = "<group>"; }; + 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Deep.png"; sourceTree = "<group>"; }; + 445A29260BFA5C1200E4E641 /* Outline-Flat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Flat.png"; sourceTree = "<group>"; }; + 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Flattened.png"; sourceTree = "<group>"; }; + 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageAndTextCell.h; sourceTree = "<group>"; }; + 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ImageAndTextCell.m; sourceTree = "<group>"; }; + 449F03DE0BE00DE9003F15C8 /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = "<group>"; }; + 449F03DF0BE00DE9003F15C8 /* Bridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Bridge.m; sourceTree = "<group>"; }; + 44A794A00BE16C380069680C /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; }; + 44A797F10BE3F9B70069680C /* table-mixed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-mixed.tif"; sourceTree = "<group>"; }; + 44F472AF0C0DB735006428EF /* Change_Absent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Absent.png; sourceTree = "<group>"; }; + 44F472B00C0DB735006428EF /* Change_Unmodified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Unmodified.png; sourceTree = "<group>"; }; + 690F564404F11EC300CF23A4 /* ProfileController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProfileController.h; sourceTree = "<group>"; }; + 690F564504F11EC300CF23A4 /* ProfileController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProfileController.m; sourceTree = "<group>"; }; + 691CE180051BB44A00CF23A4 /* ProfileTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProfileTableView.h; sourceTree = "<group>"; }; + 691CE181051BB44A00CF23A4 /* ProfileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProfileTableView.m; sourceTree = "<group>"; }; + 69660DC604F08CC100CF23A4 /* MyController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyController.h; sourceTree = "<group>"; }; + 69660DC704F08CC100CF23A4 /* MyController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MyController.m; sourceTree = "<group>"; }; + 697985CD050CFA2D00CF23A4 /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; }; + 697985CE050CFA2D00CF23A4 /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; }; + 69BA7DA804FD695200CF23A4 /* ReconTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReconTableView.h; sourceTree = "<group>"; }; + 69BA7DA904FD695200CF23A4 /* ReconTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReconTableView.m; sourceTree = "<group>"; }; + 69C625CA0664E94E00B3C46A /* Unison.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Unison.icns; sourceTree = "<group>"; }; + 69C625F40664EC3300B3C46A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; + 69C625F50664EC3300B3C46A /* Unison.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Unison.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ReconItem.m; sourceTree = "<group>"; }; + 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ReconItem.h; sourceTree = "<group>"; }; + 69E407B907EB95AA00D37AA1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; + 8450B1361918859E00A2C4D6 /* ColorGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorGradientView.h; sourceTree = "<group>"; }; + 8450B1371918859E00A2C4D6 /* ColorGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorGradientView.m; sourceTree = "<group>"; }; + 849BE4FA191AC10E001B6FBF /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; + 849BE4FB191AC10E001B6FBF /* SSSelectableToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSelectableToolbar.h; sourceTree = "<group>"; }; + 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSSelectableToolbar.m; sourceTree = "<group>"; }; + 849BE4FD191AC10E001B6FBF /* SSSelectableToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSelectableToolbarItem.h; sourceTree = "<group>"; }; + 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSSelectableToolbarItem.m; sourceTree = "<group>"; }; + B518071209D6652100B1B21F /* add.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = add.tif; sourceTree = "<group>"; }; + B518071309D6652100B1B21F /* diff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = diff.tif; sourceTree = "<group>"; }; + B518071409D6652100B1B21F /* go.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = go.tif; sourceTree = "<group>"; }; + B518071509D6652100B1B21F /* left.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = left.tif; sourceTree = "<group>"; }; + B518071609D6652100B1B21F /* merge.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = merge.tif; sourceTree = "<group>"; }; + B518071709D6652100B1B21F /* quit.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = quit.tif; sourceTree = "<group>"; }; + B518071809D6652100B1B21F /* restart.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = restart.tif; sourceTree = "<group>"; }; + B518071909D6652100B1B21F /* right.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = right.tif; sourceTree = "<group>"; }; + B518071A09D6652100B1B21F /* save.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = save.tif; sourceTree = "<group>"; }; + B518071B09D6652100B1B21F /* skip.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = skip.tif; sourceTree = "<group>"; }; + B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UnisonToolbar.h; sourceTree = "<group>"; }; + B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UnisonToolbar.m; sourceTree = "<group>"; }; + B5B44C1109DF61A4000DC7AF /* table-conflict.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-conflict.tif"; sourceTree = "<group>"; }; + B5B44C1209DF61A4000DC7AF /* table-error.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-error.tif"; sourceTree = "<group>"; }; + B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-blue.tif"; sourceTree = "<group>"; }; + B5B44C1409DF61A4000DC7AF /* table-left-green.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-green.tif"; sourceTree = "<group>"; }; + B5B44C1509DF61A4000DC7AF /* table-merge.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-merge.tif"; sourceTree = "<group>"; }; + B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-right-blue.tif"; sourceTree = "<group>"; }; + B5B44C1709DF61A4000DC7AF /* table-right-green.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-right-green.tif"; sourceTree = "<group>"; }; + B5B44C1809DF61A4000DC7AF /* table-skip.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-skip.tif"; sourceTree = "<group>"; }; + B5E03B3809E38B9E0058C7B9 /* rescan.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = rescan.tif; sourceTree = "<group>"; }; + DE2444D510C294EA007E1546 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 69C625F10664EC3300B3C46A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */, - 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */, - 44A794A10BE16C380069680C /* ExceptionHandling.framework in Frameworks */, - 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 69C625F10664EC3300B3C46A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */, + 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */, + 44A794A10BE16C380069680C /* ExceptionHandling.framework in Frameworks */, + 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 69C625F50664EC3300B3C46A /* Unison.app */, - ); - name = Products; - sourceTree = "<group>"; - }; - 29B97314FDCFA39411CA2CEA /* uimac */ = { - isa = PBXGroup; - children = ( - 44042D0F0BE52AD700A6BBB2 /* progressicons */, - B5B44C1009DF61A4000DC7AF /* tableicons */, - B518071109D6652000B1B21F /* toolbar */, - 44A795C90BE2B91B0069680C /* Classes */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - 69C625F40664EC3300B3C46A /* Info.plist */, - 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */, - 2E282CB80D9AE16300439D01 /* External objects */, - ); - name = uimac; - sourceTree = "<group>"; - }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "Other Sources"; - sourceTree = "<group>"; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - DE2444D410C294EA007E1546 /* MainMenu.xib */, - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, - 69C625CA0664E94E00B3C46A /* Unison.icns */, - ); - name = Resources; - sourceTree = "<group>"; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, - 44A794A00BE16C380069680C /* ExceptionHandling.framework */, - 69E407B907EB95AA00D37AA1 /* Security.framework */, - ); - name = Frameworks; - sourceTree = "<group>"; - }; - 2E282CB80D9AE16300439D01 /* External objects */ = { - isa = PBXGroup; - children = ( - 2E282CC70D9AE2B000439D01 /* unison-blob.o */, - ); - name = "External objects"; - sourceTree = "<group>"; - }; - 44042D0F0BE52AD700A6BBB2 /* progressicons */ = { - isa = PBXGroup; - children = ( - 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */, - 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */, - 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */, - 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */, - 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */, - 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */, - 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */, - 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */, - 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */, - 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */, - 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */, - ); - name = progressicons; - sourceTree = "<group>"; - }; - 44A795C90BE2B91B0069680C /* Classes */ = { - isa = PBXGroup; - children = ( - 849BE4F9191AC10E001B6FBF /* ssselectabletoolbar */, - 8450B1361918859E00A2C4D6 /* ColorGradientView.h */, - 8450B1371918859E00A2C4D6 /* ColorGradientView.m */, - 69660DC604F08CC100CF23A4 /* MyController.h */, - 69660DC704F08CC100CF23A4 /* MyController.m */, - 2A3C3F7A09922D4900E404E9 /* NotificationController.h */, - 2A3C3F7B09922D4900E404E9 /* NotificationController.m */, - 69BA7DA804FD695200CF23A4 /* ReconTableView.h */, - 69BA7DA904FD695200CF23A4 /* ReconTableView.m */, - 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */, - 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */, - 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */, - 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */, - 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */, - 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */, - 690F564404F11EC300CF23A4 /* ProfileController.h */, - 690F564504F11EC300CF23A4 /* ProfileController.m */, - 697985CD050CFA2D00CF23A4 /* PreferencesController.h */, - 697985CE050CFA2D00CF23A4 /* PreferencesController.m */, - 691CE180051BB44A00CF23A4 /* ProfileTableView.h */, - 691CE181051BB44A00CF23A4 /* ProfileTableView.m */, - B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */, - B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */, - 449F03DE0BE00DE9003F15C8 /* Bridge.h */, - 449F03DF0BE00DE9003F15C8 /* Bridge.m */, - ); - name = Classes; - sourceTree = "<group>"; - }; - 849BE4F9191AC10E001B6FBF /* ssselectabletoolbar */ = { - isa = PBXGroup; - children = ( - 849BE4FA191AC10E001B6FBF /* README */, - 849BE4FB191AC10E001B6FBF /* SSSelectableToolbar.h */, - 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */, - 849BE4FD191AC10E001B6FBF /* SSSelectableToolbarItem.h */, - 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */, - ); - path = ssselectabletoolbar; - sourceTree = "<group>"; - }; - B518071109D6652000B1B21F /* toolbar */ = { - isa = PBXGroup; - children = ( - B5E03B3809E38B9E0058C7B9 /* rescan.tif */, - B518071209D6652100B1B21F /* add.tif */, - B518071309D6652100B1B21F /* diff.tif */, - B518071409D6652100B1B21F /* go.tif */, - B518071509D6652100B1B21F /* left.tif */, - B518071609D6652100B1B21F /* merge.tif */, - B518071709D6652100B1B21F /* quit.tif */, - B518071809D6652100B1B21F /* restart.tif */, - B518071909D6652100B1B21F /* right.tif */, - B518071A09D6652100B1B21F /* save.tif */, - B518071B09D6652100B1B21F /* skip.tif */, - ); - path = toolbar; - sourceTree = "<group>"; - }; - B5B44C1009DF61A4000DC7AF /* tableicons */ = { - isa = PBXGroup; - children = ( - 44F472AF0C0DB735006428EF /* Change_Absent.png */, - 44F472B00C0DB735006428EF /* Change_Unmodified.png */, - 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */, - 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */, - 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */, - 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */, - 44A797F10BE3F9B70069680C /* table-mixed.tif */, - B5B44C1109DF61A4000DC7AF /* table-conflict.tif */, - B5B44C1209DF61A4000DC7AF /* table-error.tif */, - B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */, - B5B44C1409DF61A4000DC7AF /* table-left-green.tif */, - B5B44C1509DF61A4000DC7AF /* table-merge.tif */, - B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */, - B5B44C1709DF61A4000DC7AF /* table-right-green.tif */, - B5B44C1809DF61A4000DC7AF /* table-skip.tif */, - 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */, - 445A29260BFA5C1200E4E641 /* Outline-Flat.png */, - 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */, - ); - path = tableicons; - sourceTree = "<group>"; - }; + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 69C625F50664EC3300B3C46A /* Unison.app */, + ); + name = Products; + sourceTree = "<group>"; + }; + 29B97314FDCFA39411CA2CEA /* uimac */ = { + isa = PBXGroup; + children = ( + 44042D0F0BE52AD700A6BBB2 /* progressicons */, + B5B44C1009DF61A4000DC7AF /* tableicons */, + B518071109D6652000B1B21F /* toolbar */, + 44A795C90BE2B91B0069680C /* Classes */, + 29B97315FDCFA39411CA2CEA /* Other Sources */, + 29B97317FDCFA39411CA2CEA /* Resources */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 19C28FACFE9D520D11CA2CBB /* Products */, + 69C625F40664EC3300B3C46A /* Info.plist */, + 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */, + 2E282CB80D9AE16300439D01 /* External objects */, + ); + name = uimac; + sourceTree = "<group>"; + }; + 29B97315FDCFA39411CA2CEA /* Other Sources */ = { + isa = PBXGroup; + children = ( + 29B97316FDCFA39411CA2CEA /* main.m */, + ); + name = "Other Sources"; + sourceTree = "<group>"; + }; + 29B97317FDCFA39411CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + DE2444D410C294EA007E1546 /* MainMenu.xib */, + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, + 69C625CA0664E94E00B3C46A /* Unison.icns */, + ); + name = Resources; + sourceTree = "<group>"; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, + 44A794A00BE16C380069680C /* ExceptionHandling.framework */, + 69E407B907EB95AA00D37AA1 /* Security.framework */, + ); + name = Frameworks; + sourceTree = "<group>"; + }; + 2E282CB80D9AE16300439D01 /* External objects */ = { + isa = PBXGroup; + children = ( + 2E282CC70D9AE2B000439D01 /* unison-blob.o */, + ); + name = "External objects"; + sourceTree = "<group>"; + }; + 44042D0F0BE52AD700A6BBB2 /* progressicons */ = { + isa = PBXGroup; + children = ( + 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */, + 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */, + 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */, + 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */, + 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */, + 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */, + 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */, + 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */, + 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */, + 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */, + 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */, + ); + name = progressicons; + sourceTree = "<group>"; + }; + 44A795C90BE2B91B0069680C /* Classes */ = { + isa = PBXGroup; + children = ( + 849BE4F9191AC10E001B6FBF /* ssselectabletoolbar */, + 8450B1361918859E00A2C4D6 /* ColorGradientView.h */, + 8450B1371918859E00A2C4D6 /* ColorGradientView.m */, + 69660DC604F08CC100CF23A4 /* MyController.h */, + 69660DC704F08CC100CF23A4 /* MyController.m */, + 2A3C3F7A09922D4900E404E9 /* NotificationController.h */, + 2A3C3F7B09922D4900E404E9 /* NotificationController.m */, + 69BA7DA804FD695200CF23A4 /* ReconTableView.h */, + 69BA7DA904FD695200CF23A4 /* ReconTableView.m */, + 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */, + 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */, + 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */, + 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */, + 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */, + 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */, + 690F564404F11EC300CF23A4 /* ProfileController.h */, + 690F564504F11EC300CF23A4 /* ProfileController.m */, + 697985CD050CFA2D00CF23A4 /* PreferencesController.h */, + 697985CE050CFA2D00CF23A4 /* PreferencesController.m */, + 691CE180051BB44A00CF23A4 /* ProfileTableView.h */, + 691CE181051BB44A00CF23A4 /* ProfileTableView.m */, + B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */, + B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */, + 449F03DE0BE00DE9003F15C8 /* Bridge.h */, + 449F03DF0BE00DE9003F15C8 /* Bridge.m */, + ); + name = Classes; + sourceTree = "<group>"; + }; + 849BE4F9191AC10E001B6FBF /* ssselectabletoolbar */ = { + isa = PBXGroup; + children = ( + 849BE4FA191AC10E001B6FBF /* README */, + 849BE4FB191AC10E001B6FBF /* SSSelectableToolbar.h */, + 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */, + 849BE4FD191AC10E001B6FBF /* SSSelectableToolbarItem.h */, + 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */, + ); + path = ssselectabletoolbar; + sourceTree = "<group>"; + }; + B518071109D6652000B1B21F /* toolbar */ = { + isa = PBXGroup; + children = ( + B5E03B3809E38B9E0058C7B9 /* rescan.tif */, + B518071209D6652100B1B21F /* add.tif */, + B518071309D6652100B1B21F /* diff.tif */, + B518071409D6652100B1B21F /* go.tif */, + B518071509D6652100B1B21F /* left.tif */, + B518071609D6652100B1B21F /* merge.tif */, + B518071709D6652100B1B21F /* quit.tif */, + B518071809D6652100B1B21F /* restart.tif */, + B518071909D6652100B1B21F /* right.tif */, + B518071A09D6652100B1B21F /* save.tif */, + B518071B09D6652100B1B21F /* skip.tif */, + ); + path = toolbar; + sourceTree = "<group>"; + }; + B5B44C1009DF61A4000DC7AF /* tableicons */ = { + isa = PBXGroup; + children = ( + 44F472AF0C0DB735006428EF /* Change_Absent.png */, + 44F472B00C0DB735006428EF /* Change_Unmodified.png */, + 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */, + 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */, + 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */, + 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */, + 44A797F10BE3F9B70069680C /* table-mixed.tif */, + B5B44C1109DF61A4000DC7AF /* table-conflict.tif */, + B5B44C1209DF61A4000DC7AF /* table-error.tif */, + B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */, + B5B44C1409DF61A4000DC7AF /* table-left-green.tif */, + B5B44C1509DF61A4000DC7AF /* table-merge.tif */, + B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */, + B5B44C1709DF61A4000DC7AF /* table-right-green.tif */, + B5B44C1809DF61A4000DC7AF /* table-skip.tif */, + 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */, + 445A29260BFA5C1200E4E641 /* Outline-Flat.png */, + 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */, + ); + path = tableicons; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 69C625DD0664EC3300B3C46A /* uimac */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */; - buildPhases = ( - 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */, - 69C625E50664EC3300B3C46A /* Resources */, - 69C625E90664EC3300B3C46A /* Sources */, - 69C625F10664EC3300B3C46A /* Frameworks */, - 2A3C3F3709922AA600E404E9 /* CopyFiles */, - BB6E50CF10CAA57600E23F8A /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 2A124E800DE1C4E400524237 /* PBXTargetDependency */, - ); - name = uimac; - productInstallPath = "$(HOME)/Applications"; - productName = uimac; - productReference = 69C625F50664EC3300B3C46A /* Unison.app */; - productType = "com.apple.product-type.application"; - }; + 69C625DD0664EC3300B3C46A /* uimac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */; + buildPhases = ( + 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */, + 69C625E50664EC3300B3C46A /* Resources */, + 69C625E90664EC3300B3C46A /* Sources */, + 69C625F10664EC3300B3C46A /* Frameworks */, + 2A3C3F3709922AA600E404E9 /* CopyFiles */, + BB6E50CF10CAA57600E23F8A /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 2A124E800DE1C4E400524237 /* PBXTargetDependency */, + ); + name = uimac; + productInstallPath = "$(HOME)/Applications"; + productName = uimac; + productReference = 69C625F50664EC3300B3C46A /* Unison.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0410; - }; - buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* uimac */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 69C625DD0664EC3300B3C46A /* uimac */, - 2A124E780DE1C48400524237 /* Create ExternalSettings */, - ); - }; + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0720; + }; + buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */; + compatibilityVersion = "Xcode 6.3"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* uimac */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 69C625DD0664EC3300B3C46A /* uimac */, + 2A124E780DE1C48400524237 /* Create ExternalSettings */, + ); + }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 69C625E50664EC3300B3C46A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */, - 69C625E80664EC3300B3C46A /* Unison.icns in Resources */, - B518071C09D6652100B1B21F /* add.tif in Resources */, - B518071D09D6652100B1B21F /* diff.tif in Resources */, - B518071E09D6652100B1B21F /* go.tif in Resources */, - B518071F09D6652100B1B21F /* left.tif in Resources */, - B518072009D6652100B1B21F /* merge.tif in Resources */, - B518072109D6652100B1B21F /* quit.tif in Resources */, - B518072209D6652100B1B21F /* restart.tif in Resources */, - B518072309D6652100B1B21F /* right.tif in Resources */, - B518072409D6652100B1B21F /* save.tif in Resources */, - B518072509D6652100B1B21F /* skip.tif in Resources */, - B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */, - B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */, - B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */, - B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */, - B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */, - B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */, - B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */, - B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */, - B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */, - 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */, - 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */, - 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */, - 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */, - 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */, - 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */, - 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */, - 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */, - 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */, - 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */, - 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */, - 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */, - 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */, - 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */, - 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */, - 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */, - 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */, - 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */, - 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */, - 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */, - 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */, - DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */, - 849BE4FF191AC10E001B6FBF /* README in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 69C625E50664EC3300B3C46A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */, + 69C625E80664EC3300B3C46A /* Unison.icns in Resources */, + B518071C09D6652100B1B21F /* add.tif in Resources */, + B518071D09D6652100B1B21F /* diff.tif in Resources */, + B518071E09D6652100B1B21F /* go.tif in Resources */, + B518071F09D6652100B1B21F /* left.tif in Resources */, + B518072009D6652100B1B21F /* merge.tif in Resources */, + B518072109D6652100B1B21F /* quit.tif in Resources */, + B518072209D6652100B1B21F /* restart.tif in Resources */, + B518072309D6652100B1B21F /* right.tif in Resources */, + B518072409D6652100B1B21F /* save.tif in Resources */, + B518072509D6652100B1B21F /* skip.tif in Resources */, + B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */, + B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */, + B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */, + B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */, + B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */, + B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */, + B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */, + B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */, + B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */, + 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */, + 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */, + 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */, + 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */, + 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */, + 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */, + 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */, + 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */, + 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */, + 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */, + 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */, + 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */, + 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */, + 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */, + 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */, + 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */, + 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */, + 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */, + 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */, + 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */, + 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */, + DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */, + 849BE4FF191AC10E001B6FBF /* README in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script (version, ocaml lib dir)"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "if [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\nif [ ! -x ${PROJECT_DIR}/../Makefile.ProjectInfo ]; then\n if [ ! -x ${PROJECT_DIR}/../mkProjectInfo ]; then\n cd ${PROJECT_DIR}/..; ocamlc -o mkProjectInfo unix.cma str.cma mkProjectInfo.ml\n fi\n cd ${PROJECT_DIR}/..; ./mkProjectInfo > Makefile.ProjectInfo\nfi\nOCAMLLIBDIR=`ocamlc -v | tail -n -1 | sed -e 's/.* //g' | sed -e 's/\\\\\\/\\\\//g' | tr -d '\\r'`\nsource ${PROJECT_DIR}/../Makefile.ProjectInfo\necho MARKETING_VERSION = $VERSION > ${PROJECT_DIR}/ExternalSettings.xcconfig\necho OCAMLLIBDIR = $OCAMLLIBDIR >> ${PROJECT_DIR}/ExternalSettings.xcconfig"; - }; - 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script (make unison-blob.o)"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "echo \"Building unison-blob.o...\"\nif [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\ncd ${PROJECT_DIR}/..\nmake unison-blob.o\necho \"done\""; - }; + 2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script (version, ocaml lib dir)"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\nif [ ! -x ${PROJECT_DIR}/../Makefile.ProjectInfo ]; then\n if [ ! -x ${PROJECT_DIR}/../mkProjectInfo ]; then\n cd ${PROJECT_DIR}/..; ocamlc -o mkProjectInfo unix.cma str.cma mkProjectInfo.ml\n fi\n cd ${PROJECT_DIR}/..; ./mkProjectInfo > Makefile.ProjectInfo\nfi\nOCAMLLIBDIR=`ocamlc -v | tail -n -1 | sed -e 's/.* //g' | sed -e 's/\\\\\\/\\\\//g' | tr -d '\\r'`\nsource ${PROJECT_DIR}/../Makefile.ProjectInfo\necho MARKETING_VERSION = $VERSION > ${PROJECT_DIR}/ExternalSettings.xcconfig\necho OCAMLLIBDIR = $OCAMLLIBDIR >> ${PROJECT_DIR}/ExternalSettings.xcconfig"; + }; + 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script (make unison-blob.o)"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"Building unison-blob.o...\"\nif [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\ncd ${PROJECT_DIR}/..\nmake unison-blob.o\necho \"done\""; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 69C625E90664EC3300B3C46A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69C625EA0664EC3300B3C46A /* main.m in Sources */, - 69C625EB0664EC3300B3C46A /* MyController.m in Sources */, - 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */, - 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */, - 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */, - 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */, - 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */, - 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */, - B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */, - 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */, - 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */, - 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */, - 8450B1381918859E00A2C4D6 /* ColorGradientView.m in Sources */, - 849BE500191AC10E001B6FBF /* SSSelectableToolbar.m in Sources */, - 849BE501191AC10E001B6FBF /* SSSelectableToolbarItem.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 69C625E90664EC3300B3C46A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 69C625EA0664EC3300B3C46A /* main.m in Sources */, + 69C625EB0664EC3300B3C46A /* MyController.m in Sources */, + 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */, + 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */, + 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */, + 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */, + 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */, + 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */, + B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */, + 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */, + 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */, + 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */, + 8450B1381918859E00A2C4D6 /* ColorGradientView.m in Sources */, + 849BE500191AC10E001B6FBF /* SSSelectableToolbar.m in Sources */, + 849BE501191AC10E001B6FBF /* SSSelectableToolbarItem.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 2A124E800DE1C4E400524237 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 2A124E780DE1C48400524237 /* Create ExternalSettings */; - targetProxy = 2A124E7F0DE1C4E400524237 /* PBXContainerItemProxy */; - }; + 2A124E800DE1C4E400524237 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 2A124E780DE1C48400524237 /* Create ExternalSettings */; + targetProxy = 2A124E7F0DE1C4E400524237 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C165DFE840E0CC02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = "<group>"; - }; - DE2444D410C294EA007E1546 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - DE2444D510C294EA007E1546 /* English */, - ); - name = MainMenu.xib; - sourceTree = "<group>"; - }; + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C165DFE840E0CC02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = "<group>"; + }; + DE2444D410C294EA007E1546 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + DE2444D510C294EA007E1546 /* English */, + ); + name = MainMenu.xib; + sourceTree = "<group>"; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 2A124E790DE1C48400524237 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "Create ExternalSettings"; - }; - name = Development; - }; - 2A124E7A0DE1C48400524237 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - PRODUCT_NAME = "Create ExternalSettings"; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 2A124E7B0DE1C48400524237 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "Create ExternalSettings"; - }; - name = Default; - }; - 2A3C3F290992245300E404E9 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(FRAMEWORK_SEARCH_PATHS)", - "$(SRCROOT)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - NSZombieEnabled = YES; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-L$(OCAMLLIBDIR)", - "-lunix", - "-lthreadsnat", - "-lcamlstr", - "-lbigarray", - "-lasmrun", - ); - PRODUCT_NAME = Unison; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - ZERO_LINK = YES; - }; - name = Development; - }; - 2A3C3F2A0992245300E404E9 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(FRAMEWORK_SEARCH_PATHS)", - "$(SRCROOT)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-L$(OCAMLLIBDIR)", - "-lunix", - "-lthreadsnat", - "-lcamlstr", - "-lbigarray", - "-lasmrun", - ); - PRODUCT_NAME = Unison; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 2A3C3F2B0992245300E404E9 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(FRAMEWORK_SEARCH_PATHS)", - "$(SRCROOT)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "-L$(OCAMLLIBDIR)", - "-lunix", - "-lthreadsnat", - "-lcamlstr", - "-lbigarray", - "-lasmrun", - ); - PRODUCT_NAME = Unison; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - ZERO_LINK = NO; - }; - name = Default; - }; - 2A3C3F2D0992245300E404E9 /* Development */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; - buildSettings = { - LIBRARY_SEARCH_PATHS = ""; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; - }; - name = Development; - }; - 2A3C3F2E0992245300E404E9 /* Deployment */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; - buildSettings = { - LIBRARY_SEARCH_PATHS = ""; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; - }; - name = Deployment; - }; - 2A3C3F2F0992245300E404E9 /* Default */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; - buildSettings = { - LIBRARY_SEARCH_PATHS = ""; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; - }; - name = Default; - }; + 2A124E790DE1C48400524237 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Create ExternalSettings"; + }; + name = Development; + }; + 2A124E7A0DE1C48400524237 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + PRODUCT_NAME = "Create ExternalSettings"; + ZERO_LINK = NO; + }; + name = Deployment; + }; + 2A124E7B0DE1C48400524237 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "Create ExternalSettings"; + }; + name = Default; + }; + 2A3C3F290992245300E404E9 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(FRAMEWORK_SEARCH_PATHS)", + "$(SRCROOT)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + NSZombieEnabled = YES; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ( + "-L$(OCAMLLIBDIR)", + "-lunix", + "-lthreadsnat", + "-lcamlstr", + "-lbigarray", + "-lasmrun", + ); + PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison; + PRODUCT_NAME = Unison; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; + ZERO_LINK = YES; + }; + name = Development; + }; + 2A3C3F2A0992245300E404E9 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(FRAMEWORK_SEARCH_PATHS)", + "$(SRCROOT)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ( + "-L$(OCAMLLIBDIR)", + "-lunix", + "-lthreadsnat", + "-lcamlstr", + "-lbigarray", + "-lasmrun", + ); + PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison; + PRODUCT_NAME = Unison; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Deployment; + }; + 2A3C3F2B0992245300E404E9 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(FRAMEWORK_SEARCH_PATHS)", + "$(SRCROOT)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ( + "-L$(OCAMLLIBDIR)", + "-lunix", + "-lthreadsnat", + "-lcamlstr", + "-lbigarray", + "-lasmrun", + ); + PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison; + PRODUCT_NAME = Unison; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Default; + }; + 2A3C3F2D0992245300E404E9 /* Development */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; + buildSettings = { + ENABLE_TESTABILITY = YES; + LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; + }; + name = Development; + }; + 2A3C3F2E0992245300E404E9 /* Deployment */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; + buildSettings = { + LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; + }; + name = Deployment; + }; + 2A3C3F2F0992245300E404E9 /* Default */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; + buildSettings = { + LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; + }; + name = Default; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2A124E790DE1C48400524237 /* Development */, - 2A124E7A0DE1C48400524237 /* Deployment */, - 2A124E7B0DE1C48400524237 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2A3C3F290992245300E404E9 /* Development */, - 2A3C3F2A0992245300E404E9 /* Deployment */, - 2A3C3F2B0992245300E404E9 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2A3C3F2D0992245300E404E9 /* Development */, - 2A3C3F2E0992245300E404E9 /* Deployment */, - 2A3C3F2F0992245300E404E9 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; + 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A124E790DE1C48400524237 /* Development */, + 2A124E7A0DE1C48400524237 /* Deployment */, + 2A124E7B0DE1C48400524237 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; + 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A3C3F290992245300E404E9 /* Development */, + 2A3C3F2A0992245300E404E9 /* Deployment */, + 2A3C3F2B0992245300E404E9 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; + 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A3C3F2D0992245300E404E9 /* Development */, + 2A3C3F2E0992245300E404E9 /* Deployment */, + 2A3C3F2F0992245300E404E9 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; /* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; } diff --git a/src/uimacnew/.gitignore b/src/uimacnew/.gitignore deleted file mode 100644 index ccea64c..0000000 --- a/src/uimacnew/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -/ExternalSettings.xcconfig diff --git a/src/uimacnew/uimacnew.xcodeproj/.gitignore b/src/uimacnew/uimacnew.xcodeproj/.gitignore deleted file mode 100644 index fa33f18..0000000 --- a/src/uimacnew/uimacnew.xcodeproj/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.mode1v3 -/*.pbxuser diff --git a/src/uitext.ml b/src/uitext.ml index 250c36f..a53d300 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -110,7 +110,7 @@ let getInput () = (* We cannot used buffered I/Os under Windows, as character '\r' is not passed through (probably due to the code that turns \r\n into \n) *) - let s = String.create 1 in + let s = Bytes.create 1 in let n = Unix.read Unix.stdin s 0 1 in if n = 0 then raise End_of_file; if s.[0] = '\003' then raise Sys.Break; diff --git a/src/unicode.ml b/src/unicode.ml index c0ef8fe..cfa4d58 100644 --- a/src/unicode.ml +++ b/src/unicode.ml @@ -930,7 +930,7 @@ let rec norm s i l s' j = let normalize s = let l = String.length s in - let s' = String.create (3 * l) in + let s' = Bytes.create (3 * l) in try let s' = norm s 0 l s' 0 in order s'; s' with Invalid -> @@ -1027,7 +1027,7 @@ let rec decomp s i l s' j = let decompose s = let l = String.length s in - let s' = String.create (3 * l) in + let s' = Bytes.create (3 * l) in try let s' = decomp s 0 l s' 0 in order s'; s' with Invalid -> @@ -1753,7 +1753,7 @@ let rec scan s' i' l' s i l = let from_utf_16 s = let l = String.length s in let l' = 3 * l / 2 in - let s' = String.create l' in + let s' = Bytes.create l' in scan s' 0 l' s 0 l (****) @@ -1813,7 +1813,7 @@ let rec scan s' i' l' s i l = let from_utf_16_filename s = let l = String.length s in let l' = 3 * l / 2 in - let s' = String.create l' in + let s' = Bytes.create l' in scan s' 0 l' s 0 l (****) diff --git a/src/uutil.ml b/src/uutil.ml index 09d1fdc..b0c7c70 100644 --- a/src/uutil.ml +++ b/src/uutil.ml @@ -113,7 +113,7 @@ let showUpdateStatus path = let bufsize = 16384 let bufsizeFS = Filesize.ofInt bufsize -let buf = String.create bufsize +let buf = Bytes.create bufsize let readWrite source target notify = let len = ref 0 in |