Revision 7bfb3367
ID | 7bfb336771c1b7be4572940a855dccc26e08d8e2 |
Parent | c55cc346, a0a63e76 |
Child | 035b33e2 |
Merge remote-tracking branch 'origin/devel-2.5'
Conflicts:
Makefile.am (trivial, test data files added on both branches)
lib/opcodes.py (trivial, master renamed filter→qfilter, 2.5
fixed the type of the parameter)
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
Files
- added
- modified
- copied
- renamed
- deleted