Merge branch 'mainline'

Conflicts: .gitignore src/Three20UI/Sources/TTTableCaptionItemCell.m src/Three20UI/Sources/TTTableLinkedItemCell.m src/Three20UI/Sources/TTTableViewController.m src/Three20UICommon/Sources/TTBaseViewController.m
MattNewberry · Mar 22, 2011 · cf73964 · cf73964
2 parents cc3daaa + 4cd5ff6
commit cf73964
Show file tree

Hide file tree

Showing 907 changed files with 7,722 additions and 20,429 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,12 +5,17 @@ Products
 *.pbxuser
 *.perspectivev3
 *.mode1v3
+*.xcworkspace
+xcuserdata
 .DS_Store
+config
 src/Three20/*.h
 src/Three20Core/*.h
 src/Three20Network/*.h
 src/Three20Style/*.h
 src/Three20UICommon/*.h
 src/Three20UINavigator/*.h
 src/Three20UI/*.h
-*.xcodeproj
+extensions/
+
+*.pyc
diff --git a/AUTHORS b/AUTHORS
@@ -7,9 +7,10 @@ Joe Hewitt       github.com/joehewitt      @joehewitt
 
 Current Maintainers
 -------------------
-Owen Yamauchi    github.com/oyamauchi      oyamauchi@facebook.com
-Jeff Verkoeyen   github.com/jverkoey       jverkoey@gmail.com
-John Wang        github.com/jwang          jwang392@gmail.com
+Owen Yamauchi      github.com/oyamauchi      oyamauchi@facebook.com
+Jeff Verkoeyen     github.com/jverkoey       jverkoey@gmail.com
+John Wang          github.com/jwang          jwang392@gmail.com
+Stephan Diederich  github.com/diederich      stephan.diederich@googlemail.com
 
 Contributors
 ------------

diff --git a/Articles/AboutModules.mdown b/Articles/AboutModules.mdown
diff --git a/Articles/DependencyCharts.mdown b/Articles/DependencyCharts.mdown
diff --git a/Articles/Network/Etag.mdown b/Articles/Network/Etag.mdown