Go to file
Alex 2e462e04d5 Resolve conflicts
All "confilcts" were actually diffs - not sure why git flew off the
handle.
2013-01-12 14:27:50 -06:00
ApacheConnector removed .vcxproj.user files 2012-11-11 10:53:02 +01:00
build Merge pull request #3 from RangelReale/mobilefixes 2012-12-02 20:28:22 -08:00
cmake Moved contributed CMake modules to "cmake" folder 2012-12-16 00:40:40 -02:00
contrib Moved contributed CMake modules to "cmake" folder 2012-12-16 00:40:40 -02:00
CppParser on Windows, quote the path passed to the compiler 2012-11-18 23:00:55 +01:00
CppUnit merge develop into master 2013-01-10 23:55:10 -06:00
Crypto Resolve conflicts 2013-01-12 14:27:50 -06:00
Data Resolve conflicts 2013-01-12 14:27:50 -06:00
doc added item to release notes 2013-01-06 22:39:48 -06:00
Foundation Resolve conflicts 2013-01-12 14:27:50 -06:00
JSON Resolve conflicts 2013-01-12 14:27:50 -06:00
Net Resolve conflicts 2013-01-12 14:27:50 -06:00
NetSSL_OpenSSL Resolve conflicts 2013-01-12 14:27:50 -06:00
PageCompiler unbundled build fixes 2013-01-05 00:04:09 -06:00
patches/AIX new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
PDF Resolve conflicts 2013-01-12 14:27:50 -06:00
PocoDoc added support for new C++11 keywords and features to CppParser and PocoDoc 2012-11-17 10:08:13 +01:00
ProGen fixed a minor issue with VS71 solution file generation - fixedBuildOrder setting was not used 2012-11-12 11:11:46 +01:00
release updated notes, modified release script 2012-12-25 22:43:02 -06:00
Util Resolve conflicts 2013-01-12 14:27:50 -06:00
XML Resolve conflicts 2013-01-12 14:27:50 -06:00
Zip Resolve conflicts 2013-01-12 14:27:50 -06:00
.gitattributes more line ending fixes 2012-11-11 11:20:31 +01:00
.gitignore add static build dirs to .gitignore 2012-12-15 11:11:48 -06:00
.travis.yml Update .travis.yml 2013-01-06 22:13:25 -06:00
build_CE_vs90.cmd new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
build_cmake.cmd the great line endings cleanup 2012-11-11 09:57:01 +01:00
build_cmake.sh added cmake support 2012-06-26 12:40:26 +00:00
build_vcexpress2008.cmd new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
build_vcexpress2010.cmd new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
build_vs71.cmd some last minute changes 2012-12-26 18:30:52 -06:00
build_vs80.cmd some last minute changes 2012-12-26 18:30:52 -06:00
build_vs90.cmd some last minute changes 2012-12-26 18:30:52 -06:00
build_vs100.cmd some last minute changes 2012-12-26 18:30:52 -06:00
build_vs110.cmd some last minute changes 2012-12-26 18:30:52 -06:00
buildwin.cmd added msbuild support for vs2010 and 2012 to buildwin.cmd 2012-11-10 12:46:34 +01:00
CHANGELOG updated CHANGELOG 2013-01-06 22:32:22 -06:00
CMakeLists.txt Moved contributed CMake modules to "cmake" folder 2012-12-16 00:40:40 -02:00
components SF#102 Fix building Poco on Debian GNU/kFreeBSD 2012-09-24 04:06:19 +00:00
configure fixed SF #597: Configure script ignores cflags 2012-12-11 22:29:33 -06:00
CONTRIBUTORS silence deprecated iODBC warnings 2012-12-16 13:52:39 -06:00
DLLVersion.rc Updated version number and copyright dates. 2013-01-10 23:31:55 +01:00
libversion update version numbers 2012-12-16 22:55:16 -06:00
LICENSE change EOL to 'native' 2012-04-29 18:52:25 +00:00
Makefile GH #36: 'distclean' requires 3 traversals of project tree 2013-01-05 20:53:42 -06:00
NEWS new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
README change EOL to 'native' 2012-04-29 18:52:25 +00:00
README.md Updated README.md with info regarding line endings 2012-11-11 10:42:13 +01:00
VERSION update version numbers 2012-12-16 22:55:16 -06:00

POCO C++ Libraries

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/

All text file line endings in the repository must be Unix-style (LF). This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters).