From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
authorcmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 31 Dec 2010 18:03:23 +0000 (18:03 +0000)
committercmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 31 Dec 2010 18:03:23 +0000 (18:03 +0000)
commit83fe3acd11b72d9f3517e1e65a66a0ffade9fa54
treed7b249da2a8034afc5e38387e425c634b6e694af
parent5820dc9c5a0c64441bc7042835397201929315fe
From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
1) Add links to RFC 4627 and the json.org web site.
2) Comment out hf_json_member_key to keep tools/checkhf.pl happy.
3) Avoid duplicate (application/json) from being displayed in Info column.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35317 f5534014-38df-0310-8fa8-9805f1628bb7
epan/dissectors/Makefile.common
epan/dissectors/packet-json.c [new file with mode: 0755]
epan/dissectors/packet-text-media.c
epan/tvbparse.c