Merge branch 'master' of github.com:ddeville/DDPageControl

Author: dd2284

.gitattributes

@@ -0,0 +1 @@
+*.pbxproj -crlf -diff -merge

.gitignore

@@ -1,34 +1,35 @@
-# Mac OS X Finder and whatnot
+# OS X
 .DS_Store
-
-# XCode (and ancestors) per-user config (very noisy, and not relevant)
-*.mode1
-*.mode1v3
-*.mode2v3
-*.perspective
-*.perspectivev3
-*.pbxuser
-
-
-# Generated files
-VersionX-revision.h
-
-
-# build products
-build/
+.DS_store
+profile
+
+# XCode
+*.mode*
+*.perspective*
+*.pbxuser*
+*tmproj
+External/GHUnit/*
+PLBlocks.framework/*
+*.pyc
+
+# for Xcode 4
+xcuserdata
+*.xcworkspace
+
+# built products
+build
 *.o
 
-# Other source repository archive directories (protects when importing)
+# Other source repository archive directories
 .hg
 .svn
 CVS
 
-
-# automatic backup files
-*~.nib
+# Automatic backup files
+#~.nib/
 *.swp
 *~
 *(Autosaved).rtfd/
 Backup[ ]of[ ]*.pages/
-Backup[ ]of[ ]*.key/
+Backup[ ]of[ ]*.key/                
 Backup[ ]of[ ]*.numbers/

LICENSE

@@ -0,0 +1,24 @@
+* Copyright (c) 2010-2011, Snappy Code
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of Snappy Code nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY Snappy Code ''AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL Snappy Code BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.