Sync with upstream

.gitignore

@@ -1,11 +1,218 @@
-# xcode noise
-build/*
+Below are multiple .gitignore files for use with Xcode/Objective-C projects
+
+##########################################
+# OS X
+.DS_Store
+
+# Xcode
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+
+# CocoaPods
+Pods
+
+##########################################
+#.gitignore file
+
+.DS_Store
+*/build/*
 *.pbxuser
+!default.pbxuser
 *.mode1v3
-DerivedData/*
-# old skool
-.svn
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+##########################################
+
+I like the links in this one ... its from 
+http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects
+
+#########################
+# .gitignore file for Xcode4 and Xcode5 Source projects
+#
+# Apple bugs, waiting for Apple to fix/respond:
+#
+#    15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation?
+#
+# Version 2.1
+# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects
+#
+# 2013 updates:
+# - fixed the broken "save personal Schemes"
+# - added line-by-line explanations for EVERYTHING (some were missing)
+#
+# NB: if you are storing "built" products, this WILL NOT WORK,
+# and you should use a different .gitignore (or none at all)
+# This file is for SOURCE projects, where there are many extra
+# files that we want to exclude
+#
+#########################
+
+#####
+# OS X temporary files that should never be committed
+#
+# c.f. http://www.westwind.com/reference/os-x/invisibles.html
+
+.DS_Store
+
+# c.f. http://www.westwind.com/reference/os-x/invisibles.html
+
+.Trashes
+
+# c.f. http://www.westwind.com/reference/os-x/invisibles.html
+
+*.swp
+
+# *.lock - this is used and abused by many editors for many different things.
+#    For the main ones I use (e.g. Eclipse), it should be excluded 
+#    from source-control, but YMMV
+
+*.lock
+
+#
+# profile - REMOVED temporarily (on double-checking, this seems incorrect; I can't find it in OS X docs?)
+#profile
+
+
+####
+# Xcode temporary files that should never be committed
+# 
+# NB: NIB/XIB files still exist even on Storyboard projects, so we want this...
+
+*~.nib
+
+
+####
+# Xcode build files -
+#
+# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData"
+
+DerivedData/
+
+# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build"
+
+build/
+
+
+#####
+# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
+#
+# This is complicated:
+#
+# SOMETIMES you need to put this file in version control.
+# Apple designed it poorly - if you use "custom executables", they are
+#  saved in this file.
+# 99% of projects do NOT use those, so they do NOT want to version control this file.
+#  ..but if you're in the 1%, comment out the line "*.pbxuser"
+
+# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html
+
+*.pbxuser
+
+# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html
+
+*.mode1v3
+
+# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html
+
+*.mode2v3
+
+# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file
+
+*.perspectivev3
+
+#    NB: also, whitelist the default ones, some projects need to use these
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+
+####
+# Xcode 4 - semi-personal settings
+#
+#
+# OPTION 1: ---------------------------------
+#     throw away ALL personal settings (including custom schemes!
+#     - unless they are "shared")
+#
+# NB: this is exclusive with OPTION 2 below
+#!xcuserdata
+
+# OPTION 2: ---------------------------------
+#     get rid of ALL personal settings, but KEEP SOME OF THEM
+#     - NB: you must manually uncomment the bits you want to keep
+#
+# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X,
+#    or manually install git over the top of the OS X version
+# NB: this is exclusive with OPTION 1 above
+#
+!xcuserdata/**/*
+
+#     (requires option 2 above): Personal Schemes
+#
+#!xcuserdata/**/xcschemes/*
+
+####
+# XCode 4 workspaces - more detailed
+#
+# Workspaces are important! They are a core feature of Xcode - don't exclude them :)
+#
+# Workspace layout is quite spammy. For reference:
+#
+# /(root)/
+#   /(project-name).xcodeproj/
+#     project.pbxproj
+#     /project.xcworkspace/
+#       contents.xcworkspacedata
+#       /xcuserdata/
+#         /(your name)/xcuserdatad/
+#           UserInterfaceState.xcuserstate
+#     /xcsshareddata/
+#       /xcschemes/
+#         (shared scheme name).xcscheme
+#     /xcuserdata/
+#       /(your name)/xcuserdatad/
+#         (private scheme).xcscheme
+#         xcschememanagement.plist
+#
+#
+
+####
+# Xcode 4 - Deprecated classes
+#
+# Allegedly, if you manually "deprecate" your classes, they get moved here.
+#
+# We're using source-control, so this is a "feature" that we do not want!
+
+*.moved-aside
+
+####
+# UNKNOWN: recommended by others, but I can't discover what these files are
+#
+# ...none. Everything is now explained.
+##########################################
 
-# osx noise
-*.DS_Store
-*.com.apple.timemachine.supported
+##########################################

Info.plist

@@ -109,7 +109,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2</string>
+	<string>2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -129,7 +129,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>Set by script!</string>
+	<string>351 Beta 1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.lifestyle</string>
 	<key>LSMinimumSystemVersion</key>

Podfile

@@ -1,9 +1,22 @@
 source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
-platform :osx, '10.7'
+platform :osx, '10.10'
 
 target 'Wired Client' do
     pod 'Sparkle'
     pod 'SBJson4', '~> 4.0.0'
     pod 'NSDate+TimeAgo'
+    pod 'OpenSSL-Universal'
+end
+
+target 'WiredNetworking' do
+    project 'vendor/WiredFrameworks/WiredFrameworks.xcodeproj'
+    workspace 'vendor/WiredFrameworks/WiredFrameworks.xcworkspace'
+    pod 'OpenSSL-Universal'
+end
+
+target 'libwired-osx' do
+    project 'vendor/WiredFrameworks/WiredFrameworks.xcodeproj'
+    workspace 'vendor/WiredFrameworks/WiredFrameworks.xcworkspace'
+    pod 'OpenSSL-Universal'
 end

Podfile.lock

@@ -1,18 +1,28 @@
 PODS:
-  - NSDate+TimeAgo (1.0.6)
+  - "NSDate+TimeAgo (1.0.6)"
+  - OpenSSL-Universal (1.0.2.13)
   - SBJson4 (4.0.5)
   - Sparkle (1.18.1)
 
 DEPENDENCIES:
-  - NSDate+TimeAgo
+  - "NSDate+TimeAgo"
+  - OpenSSL-Universal
   - SBJson4 (~> 4.0.0)
   - Sparkle
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - "NSDate+TimeAgo"
+    - OpenSSL-Universal
+    - SBJson4
+    - Sparkle
+
 SPEC CHECKSUMS:
-  NSDate+TimeAgo: 35601c619b2d59290055e4fe76e61d97677a2360
+  "NSDate+TimeAgo": 35601c619b2d59290055e4fe76e61d97677a2360
+  OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327
   SBJson4: e1aa705a4104e83fd250420709a57de5efae96ff
   Sparkle: 06ea33170007c5937ee54da481b4481af98fac79
 
-PODFILE CHECKSUM: e8b1f65468e8440160376d49d8031caa8faa6421
+PODFILE CHECKSUM: fa150038f6c8e2bd91237273cf2233fefb2dc11c
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.5.3