Revision e4d89284
| ID | e4d8928418a56ef1500e77d615a5f2aeaa771a68 |
Merge branch 'devel-2.1' into devel-2.2
- devel-2.1:
Increase version to 2.1.7
Update NEWS for the 2.1.7 release
Conflicts:
NEWS
- merge
configure.ac
- keep the 2.2 version
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Files
- added
- modified
- copied
- renamed
- deleted