aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/Makefile.common
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2010-12-31 18:03:23 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2010-12-31 18:03:23 +0000
commit2cd8459ddb9a42c8c93bd7db688a913a0ac038b2 (patch)
treed7b249da2a8034afc5e38387e425c634b6e694af /epan/dissectors/Makefile.common
parentc16cdbb8d978a64c38293813f5d4d3b2ad650596 (diff)
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. svn path=/trunk/; revision=35317
Diffstat (limited to 'epan/dissectors/Makefile.common')
-rw-r--r--epan/dissectors/Makefile.common1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index de763ee9a2..8b893c77bd 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -601,6 +601,7 @@ DISSECTOR_SRC = \
packet-jabber.c \
packet-jmirror.c \
packet-jpeg.c \
+ packet-json.c \
packet-juniper.c \
packet-jxta.c \
packet-k12.c \