Merge branch 'master' of github.com:rezaali/ofxUI

rezaali · Apr 30, 2012 · affd87a · affd87a
2 parents b53deaa + bcbf367
commit affd87a
Show file tree

Hide file tree

Showing 131 changed files with 62 additions and 26,602 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,66 @@
 *.o
 *.so
 *.app
+*.mode*
+build/
+obj/
+Debug*/
+Release*/
+*.pyc
+
+*/bin/*
+!*/bin/data/
+
+# IDE-specific ignore patterns
+
+#XCode
+*.pbxuser
+*.perspective
+*.perspectivev3
+*.mode1v3
+*.mode2v3
+#XCode 4
+xcuserdata
+*.xcworkspace
+
+#Code::Blocks
+*.depend
+*.layout
+
+#Visual Studio
+*.sdf
+*.opensdf
+*.suo
+ipch/
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+#Eclipse
+.metadata
+local.properties
+.externalToolBuilders
+
+# OS-specific ignore patterns
+
+#Linux
+*~
+# KDE
+.directory
+
+#OSX
 .DS_Store
+*.swp
+*~.nib
+# Thumbnails
+._*
+
+#Windows
+# Windows image file caches
+Thumbs.db
+# Folder config file
+Desktop.ini
+
+#Android
+.csettings
diff --git a/example-ofxUIAllWidgets/.vcproj.user b/example-ofxUIAllWidgets/.vcproj.user
diff --git a/example-ofxUIAllWidgets/bin/data/.gitignore b/example-ofxUIAllWidgets/bin/data/.gitignore
diff --git a/...le-ofxUIAllWidgets/ofxUIAllWidgets.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...le-ofxUIAllWidgets/ofxUIAllWidgets.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...ts.xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/WorkspaceSettings.xcsettings b/...ts.xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/WorkspaceSettings.xcsettings