Merge branch 'master' of https://github.com/pocoproject/poco into develop

.gitattributes

@@ -0,0 +1,23 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.cpp text
+*.c text
+*.h text
+*.cmd text 
+*.sln text 
+*.vcproj text 
+*.vcxproj text 
+*.vcxproj.filters text 
+*.page text
+*.html text
+*.css text
+
+# Denote all files that are truly binary and should not be modified.
+*.bin binary
+*.mc binary
+*.png binary
+*.jpg binary
+*.gif binary

.gitignore

@@ -0,0 +1,79 @@
+# Compiled #
+############
+*.com
+*.class
+*.dll
+*.dylib
+*.exe
+*.slo
+*.lo
+*.o
+*.so
+*.lai
+*.la
+*.a
+*.d
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sqlite
+*.db
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# VS generated files #
+######################
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.ipch
+*.ncb
+*.suo
+*.sdf
+*.opensdf
+*.tlb
+*.tlh
+*.ilk
+*.lib
+*.exp
+*.idb
+*.rc
+*.res
+*.manifest
+*.tlog
+*.lastbuildstate
+*.unsuccesfulbuild
+release_shared/
+debug_share/
+release_static/
+debug_static/
+bin/
+bin64/
+pocomsg.h
+

README.md

@@ -0,0 +1,8 @@
+poco
+====
+
+When contributing to POCO, please adhere to our coding styleguide:
+http://www.appinf.com/download/CppCodingStyleGuide.pdf
+
+We use the branching model described in this article:
+http://nvie.com/posts/a-successful-git-branching-model/

Zip/Zip_vs110.vcxproj.user

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>

Zip/Zip_x64_vs110.vcxproj.user

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>

Zip/testsuite/TestSuite_vs110.vcxproj.user

@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 </Project>

Zip/testsuite/TestSuite_x64_vs110.vcxproj.user

@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 </Project>