tree 7fd8089f9150ec6e10271f3be6019f8b92192b20
parent 518ede51ab4a8cddcbb3282c8e304c036e40e6a6
author blep <blep@1f120ed1-78a5-a849-adca-83f0a9e25bb6> 1304370570 +0000
committer blep <blep@1f120ed1-78a5-a849-adca-83f0a9e25bb6> 1304370570 +0000

Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_IS_AMALGAMATION

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@187 1f120ed1-78a5-a849-adca-83f0a9e25bb6