Merge branch 'RefactorBranch'

xhzengAIB · Dec 30, 2014 · 0ddd1c4 · 0ddd1c4
2 parents 474103e + 2501817
commit 0ddd1c4
Show file tree

Hide file tree

Showing 1,019 changed files with 22,270 additions and 6,688 deletions.
diff --git a/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj b/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj
diff --git a/...splayExample/MessageDisplayExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...splayExample/MessageDisplayExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...isplayExample.xcodeproj/project.xcworkspace/xcshareddata/MessageDisplayExample.xccheckout b/...isplayExample.xcodeproj/project.xcworkspace/xcshareddata/MessageDisplayExample.xccheckout
diff --git a/...odeproj/project.xcworkspace/xcuserdata/qtone-1.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/qtone-1.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/qtone-1.xcuserdatad/WorkspaceSettings.xcsettings b/...xcodeproj/project.xcworkspace/xcuserdata/qtone-1.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/...playExample.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...playExample.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/...Example.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcschemes/MessageDisplayExample.xcscheme b/...Example.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcschemes/MessageDisplayExample.xcscheme
diff --git a/...ample.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcschemes/MessageDisplayFramework.xcscheme b/...ample.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcschemes/MessageDisplayFramework.xcscheme
diff --git a/...isplayExample.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcschemes/xcschememanagement.plist b/...isplayExample.xcodeproj/xcuserdata/qtone-1.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Example/MessageDisplayExample/MessageDisplayExample/MessageDisplayExample-Prefix.pch b/Example/MessageDisplayExample/MessageDisplayExample/MessageDisplayExample-Prefix.pch
diff --git a/Example/MessageDisplayExample/MessageDisplayExample/en.lproj/InfoPlist.strings b/Example/MessageDisplayExample/MessageDisplayExample/en.lproj/InfoPlist.strings
diff --git a/Example/MessageDisplayExample/MessageDisplayExample/main.m b/Example/MessageDisplayExample/MessageDisplayExample/main.m
diff --git a/Example/MessageDisplayExample/MessageDisplayExample/zh-Hans.lproj/InfoPlist.strings b/Example/MessageDisplayExample/MessageDisplayExample/zh-Hans.lproj/InfoPlist.strings
diff --git a/Example/MessageDisplayExample/MessageDisplayExampleTests/MessageDisplayExampleTests.m b/Example/MessageDisplayExample/MessageDisplayExampleTests/MessageDisplayExampleTests.m
diff --git a/Example/MessageDisplayExample/MessageDisplayExampleTests/en.lproj/InfoPlist.strings b/Example/MessageDisplayExample/MessageDisplayExampleTests/en.lproj/InfoPlist.strings
diff --git a/Example/MessageDisplayExample/MessageDisplayExampleTests/zh-Hans.lproj/InfoPlist.strings b/Example/MessageDisplayExample/MessageDisplayExampleTests/zh-Hans.lproj/InfoPlist.strings
diff --git a/Example/MessageDisplayExample/MessageDisplayFramework/MessageDisplayFramework-Prefix.pch b/Example/MessageDisplayExample/MessageDisplayFramework/MessageDisplayFramework-Prefix.pch
diff --git a/Example/MessageDisplayExample/MessageDisplayFramework/en.lproj/InfoPlist.strings b/Example/MessageDisplayExample/MessageDisplayFramework/en.lproj/InfoPlist.strings