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
2013-01-10 23:55:10 -06:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2013-01-06 22:39:48 -06:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2013-01-05 00:04:09 -06:00
2012-04-23 01:14:34 +00:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2013-01-12 14:27:50 -06:00
2012-11-11 11:20:31 +01:00
2012-12-15 11:11:48 -06:00
2013-01-06 22:13:25 -06:00
2012-04-23 01:14:34 +00:00
2012-11-11 09:57:01 +01:00
2012-06-26 12:40:26 +00:00
2012-12-26 18:30:52 -06:00
2012-12-26 18:30:52 -06:00
2012-12-26 18:30:52 -06:00
2012-12-26 18:30:52 -06:00
2012-12-26 18:30:52 -06:00
2013-01-06 22:32:22 -06:00
2012-12-16 13:52:39 -06:00
2012-12-16 22:55:16 -06:00
2012-04-29 18:52:25 +00:00
2012-04-23 01:14:34 +00:00
2012-04-29 18:52:25 +00:00
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).

Languages
C 50.8%
C++ 47.8%
CMake 0.5%
Makefile 0.2%
JavaScript 0.2%
Other 0.3%