Revision 0f51bc8d
| ID | 0f51bc8d41cf0cf62d735a52da10549aab7390a2 |
| Parent | 3fc210de, 7b790a6a |
| Child | fd7b69c0 |
Merge branch 'devel-2.4' into devel-2.5
Conflicts:
configure.ac (trivial)
Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted