doc/reference/pidgin/version.xml.in@f4c32aca3f1f
doc/reference/pidgin/version.xml.in
Sun, 05 Apr 2015 13:45:18 -0700
- author
- Mark Doliner <mark@kingant.net>
- date
- Sun, 05 Apr 2015 13:45:18 -0700
- changeset 36346
- f4c32aca3f1f
- parent 35389
- 884a5385bb2c
- permissions
- -rw-r--r--
Merge the release-2.x.y branch into master.
This was kind of a pain. As far as I can tell all the media changes that
happened in release-2.x.y were backported from master with one exception.
So I ignored all those changes from release-2.x.y and left the code in
master unchanged.
The exception is a0906e7a6bae from Jakub Adam, "Implement media encryption"
This still needs to happen in master. I didn't want to do it in this merge
because this merge was already kinda big and it seemed safer to do it
in a separate commit.
One other note:
$(GSTVIDEO_LIBS) was added to libfinch_la_LIBADD in finch/Makefile.am in
release-2.x.y in commit 2415067473ba. Is that correct? It seems weird
for finch to link against gstreamer video libraries since Finch has a
text UI.
