From: Ben Beltran <redacted>
Date: Mon, 3 Feb 2014 15:51:07 +0000 (-0600)
Subject: Merge branch 'master' of github.com:benbeltran/super-polarity
X-Git-Url: https://git.r.bdr.sh/rbdr/super-polarity/commitdiff_plain/3de51c6f55d304f038df1b77c8ab346e2a187fe1

Merge branch 'master' of github.com:benbeltran/super-polarity

Conflicts:
	.gitignore
---

3de51c6f55d304f038df1b77c8ab346e2a187fe1
diff --cc .gitignore
index 0331bbb,0881b8d..3d43fd7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,17 -1,151 +1,171 @@@
++<<<<<<< HEAD
 +# Object files
 +*.o
 +
 +# Libraries
 +*.lib
 +*.a
 +
 +# Shared objects (inc. Windows DLLs)
 +*.dll
 +*.so
 +*.so.*
 +*.dylib
 +
 +# Executables
 +*.exe
 +*.out
 +*.app
++=======
+ ## Ignore Visual Studio temporary files, build results, and
+ ## files generated by popular Visual Studio add-ons.
+ 
+ # User-specific files
+ *.suo
+ *.user
+ *.sln.docstates
+ 
+ # Build results
+ 
+ [Dd]ebug/
+ [Rr]elease/
+ x64/
+ build/
+ [Bb]in/
+ [Oo]bj/
+ 
+ # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+ !packages/*/build/
+ 
+ # MSTest test Results
+ [Tt]est[Rr]esult*/
+ [Bb]uild[Ll]og.*
+ 
+ *_i.c
+ *_p.c
+ *.ilk
+ *.meta
+ *.obj
+ *.pch
+ *.pdb
+ *.pgc
+ *.pgd
+ *.rsp
+ *.sbr
+ *.tlb
+ *.tli
+ *.tlh
+ *.tmp
+ *.tmp_proj
+ *.log
+ *.vspscc
+ *.vssscc
+ .builds
+ *.pidb
+ *.log
+ *.scc
+ 
+ # Visual C++ cache files
+ ipch/
+ *.aps
+ *.ncb
+ *.opensdf
+ *.sdf
+ *.cachefile
+ 
+ # Visual Studio profiler
+ *.psess
+ *.vsp
+ *.vspx
+ 
+ # Guidance Automation Toolkit
+ *.gpState
+ 
+ # ReSharper is a .NET coding add-in
+ _ReSharper*/
+ *.[Rr]e[Ss]harper
+ 
+ # TeamCity is a build add-in
+ _TeamCity*
+ 
+ # DotCover is a Code Coverage Tool
+ *.dotCover
+ 
+ # NCrunch
+ *.ncrunch*
+ .*crunch*.local.xml
+ 
+ # Installshield output folder
+ [Ee]xpress/
+ 
+ # DocProject is a documentation generator add-in
+ DocProject/buildhelp/
+ DocProject/Help/*.HxT
+ DocProject/Help/*.HxC
+ DocProject/Help/*.hhc
+ DocProject/Help/*.hhk
+ DocProject/Help/*.hhp
+ DocProject/Help/Html2
+ DocProject/Help/html
+ 
+ # Click-Once directory
+ publish/
+ 
+ # Publish Web Output
+ *.Publish.xml
+ *.pubxml
+ 
+ # NuGet Packages Directory
+ ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+ #packages/
+ 
+ # Windows Azure Build Output
+ csx
+ *.build.csdef
+ 
+ # Windows Store app package directory
+ AppPackages/
+ 
+ # Others
+ sql/
+ *.Cache
+ ClientBin/
+ [Ss]tyle[Cc]op.*
+ ~$*
+ *~
+ *.dbmdl
+ *.[Pp]ublish.xml
+ *.pfx
+ *.publishsettings
+ 
+ # RIA/Silverlight projects
+ Generated_Code/
+ 
+ # Backup & report files from converting an old project file to a newer
+ # Visual Studio version. Backup files are not needed, because we have git ;-)
+ _UpgradeReport_Files/
+ Backup*/
+ UpgradeLog*.XML
+ UpgradeLog*.htm
+ 
+ # SQL Server files
+ App_Data/*.mdf
+ App_Data/*.ldf
+ 
+ # =========================
+ # Windows detritus
+ # =========================
+ 
+ # Windows image file caches
+ Thumbs.db
+ ehthumbs.db
+ 
+ # Folder config file
+ Desktop.ini
+ 
+ # Recycle Bin used on file shares
+ $RECYCLE.BIN/
+ 
+ # Mac crap
+ .DS_Store
++>>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a