[Wireshark-dev] Backporting dictionary.xml from trunk to trunk-1.2

2009-07-15 Thread Gerald Combs
Revision 29052 (updates to diameter/dictionary.xml) is in the queue to be backported to 1.2. Unfortunately, this file has been updated so much over the past few weeks that the patch won't apply cleanly. Should it simply be copied from /trunk to /trunk-1.2?

Re: [Wireshark-dev] Backporting dictionary.xml from trunk to trunk-1.2

2009-07-15 Thread Anders Broman
dictionary.xml from trunk to trunk-1.2 Revision 29052 (updates to diameter/dictionary.xml) is in the queue to be backported to 1.2. Unfortunately, this file has been updated so much over the past few weeks that the patch won't apply cleanly. Should it simply be copied from /trunk to /trunk-1.2