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

GH #26: Cannot compile on gcc

2012-12-12 23:02:20 -06:00

samples

unbundled build fixes

2013-01-05 00:04:09 -06:00

src

- added Poco::XML::XMLWriter::depth() member function.

2012-11-10 11:49:39 +01:00

testsuite

merge develop into master

2013-01-10 23:55:10 -06:00

CMakeLists.txt

Resolve conflicts

2013-01-12 14:27:50 -06:00

dependencies

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

Makefile

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_CE_vs90.sln

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_CE_vs90.vcproj

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_vs71.sln

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_vs71.vcproj

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_vs80.sln

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_vs80.vcproj

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_vs90.sln

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_vs90.vcproj

change EOL to 'native'

2012-04-29 18:52:25 +00:00

XML_vs100.sln

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_vs100.vcxproj

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_vs100.vcxproj.filters

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_vs110.sln

fixed text files

2012-11-11 13:56:24 +01:00

XML_vs110.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

XML_vs110.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

XML_x64_vs90.sln

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_x64_vs90.vcproj

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_x64_vs100.sln

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_x64_vs100.vcxproj

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_x64_vs100.vcxproj.filters

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML_x64_vs110.sln

fixed text files

2012-11-11 13:56:24 +01:00

XML_x64_vs110.vcxproj

fixed text files

2012-11-11 13:56:24 +01:00

XML_x64_vs110.vcxproj.filters

fixed text files

2012-11-11 13:56:24 +01:00

XML.progen

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

XML.vxbuild

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00