From: Ace <acezhao@tencent.com>
Date: Tue, 28 Jul 2015 01:49:56 +0000 (+0800)
Subject: del .DS_Store
X-Git-Url: http://zhaoyanbai.com/repos/rndc-confgen.html?a=commitdiff_plain;h=73a75ad2ccb96e486dcb69e6c79b2a0b2fd72b04;p=acecode.git

del .DS_Store
---

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 2c3105d..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index b66ff8a..13d5da2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
 *.out
 *.pyc
+*.DS_Store
diff --git a/learn/.DS_Store b/learn/.DS_Store
deleted file mode 100644
index 8cc4f85..0000000
Binary files a/learn/.DS_Store and /dev/null differ
diff --git a/learn/AppleSwift/.DS_Store b/learn/AppleSwift/.DS_Store
deleted file mode 100644
index 4bc2632..0000000
Binary files a/learn/AppleSwift/.DS_Store and /dev/null differ
diff --git a/tools/.DS_Store b/tools/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/tools/.DS_Store and /dev/null differ
diff --git a/tools/AceBox/.DS_Store b/tools/AceBox/.DS_Store
deleted file mode 100644
index dca8d9e..0000000
Binary files a/tools/AceBox/.DS_Store and /dev/null differ
diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout
index 24b0287..97be529 100644
--- a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout
+++ b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcshareddata/AceBox.xccheckout
@@ -11,7 +11,7 @@
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>BA634633803B1A00DDD2BCDEF5C645E5844F56E6</key>
-		<string>https://github.com/acevest/acecode</string>
+		<string>https://github.com/acevest/acecode.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>tools/AceBox/AceBox.xcodeproj/project.xcworkspace</string>
@@ -21,7 +21,7 @@
 		<string>../../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/acevest/acecode</string>
+	<string>https://github.com/acevest/acecode.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate
index 857562d..dd6cba7 100644
Binary files a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib b/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib
index 8d8db7c..df50262 100644
--- a/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib
+++ b/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>