poco/Foundation
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
..
include/Poco Resolve conflicts 2013-01-12 14:27:50 -06:00
samples unbundled build fixes 2013-01-05 00:04:09 -06:00
src GH 46: 1.5.1 build fails on OS X when using libc++ 2012-12-30 09:50:59 -06:00
testsuite Resolve conflicts 2013-01-12 14:27:50 -06:00
wcelibcex-1.0 new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
CMakeLists.txt Resolve conflicts 2013-01-12 14:27:50 -06:00
extradirs new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
Foundation_CE_vs90.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
Foundation_CE_vs90.vcproj added Error.cpp/h files to VS projects 2012-12-14 14:44:45 -06:00
Foundation_vs71.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
Foundation_vs71.vcproj add Error.cpp/h to VS2003 solution 2013-01-06 11:37:38 -06:00
Foundation_vs80.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
Foundation_vs80.vcproj added Error.cpp/h files to VS projects 2012-12-14 14:44:45 -06:00
Foundation_vs90.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
Foundation_vs90.vcproj added Error.cpp/h files to VS projects 2012-12-14 14:44:45 -06:00
Foundation_vs100.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
Foundation_vs100.vcxproj Resolve conflicts 2013-01-12 14:27:50 -06:00
Foundation_vs100.vcxproj.filters replaced stream-based number formatting 2012-12-01 14:10:04 -06:00
Foundation_vs110.sln Resolve conflicts 2013-01-12 14:27:50 -06:00
Foundation_vs110.vcxproj Resolve conflicts 2013-01-12 14:27:50 -06:00
Foundation_vs110.vcxproj.filters Resolve conflicts 2013-01-12 14:27:50 -06:00
Foundation_x64_vs90.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
Foundation_x64_vs90.vcproj fixed VS90 Foundation projects 2012-12-26 22:24:49 -06:00
Foundation_x64_vs100.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
Foundation_x64_vs100.vcxproj added Error.cpp/h files to VS projects 2012-12-14 14:44:45 -06:00
Foundation_x64_vs100.vcxproj.filters added Error.cpp/h files to VS projects 2012-12-14 14:44:45 -06:00
Foundation_x64_vs110.sln fixed text files 2012-11-11 13:56:24 +01:00
Foundation_x64_vs110.vcxproj Resolve conflicts 2013-01-12 14:27:50 -06:00
Foundation_x64_vs110.vcxproj.filters Resolve conflicts 2013-01-12 14:27:50 -06:00
Foundation.vxbuild porting 1.4.4 rev. 1989 (except for File_WIN32(U)/FileImpl::isDeviceImpl() where GENERIC_ACCESS was left due to breaking testFileAtributes3() test case) 2012-08-26 03:40:12 +00:00
Makefile replaced stream-based number formatting 2012-12-01 14:10:04 -06:00