generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-15 15:21:03 +01:00
Code Issues Projects Releases Wiki Activity
poco/JSON
History
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/JSON
GH #26: Cannot compile on gcc
2012-12-12 23:02:20 -06:00
samples
fixed text files
2012-11-11 13:56:24 +01:00
src
Resolve conflicts
2013-01-12 14:27:50 -06:00
testsuite
Resolve conflicts
2013-01-12 14:27:50 -06:00
CMakeLists.txt
Resolve conflicts
2013-01-12 14:27:50 -06:00
dependencies
Add JSON dependencies file
2012-05-09 19:47:36 +00:00
JSON_CE_vs90.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_CE_vs90.vcproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs71.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs71.vcproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs80.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs80.vcproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs90.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs90.vcproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs100.sln
Resolve conflicts
2013-01-12 14:27:50 -06:00
JSON_vs100.vcxproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs100.vcxproj.filters
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs110.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs110.vcxproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_vs110.vcxproj.filters
fixed text files
2012-11-11 13:56:24 +01:00
JSON_x64_vs90.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_x64_vs90.vcproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_x64_vs100.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_x64_vs100.vcxproj
added JSON VS100 64 bit projects
2012-12-26 22:54:14 -06:00
JSON_x64_vs100.vcxproj.filters
added JSON VS100 64 bit projects
2012-12-26 22:54:14 -06:00
JSON_x64_vs110.sln
fixed text files
2012-11-11 13:56:24 +01:00
JSON_x64_vs110.vcxproj
fixed text files
2012-11-11 13:56:24 +01:00
JSON_x64_vs110.vcxproj.filters
fixed text files
2012-11-11 13:56:24 +01:00
JSON.progen
fixed text files
2012-11-11 13:56:24 +01:00
Makefile
Copy JSON from SandBox to trunk
2012-04-29 20:09:55 +00:00