]> git.0d.be Git - empathy.git/commit
projects / empathy.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: afb9276) | patch
Revert "Drop empathy-av"
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 28 Feb 2012 11:07:03 +0000 (12:07 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 1 Mar 2012 15:49:06 +0000 (16:49 +0100)
commit4110a4bc8b8c2a63e94615594eba3b109dcf97e4
treed06236f38b94639591d0b89f25c19e543a52cccatree | snapshot
parentafb9276b8a497e7b9275fb53abafd0cdb18d55fccommit | diff
Revert "Drop empathy-av"

This reverts commit ba0a893b1d31cdb234bae72845e840a895b9d62a.

Conflicts:

src/Makefile.am
18 files changed:
data/Empathy.AudioVideo.client [new file with mode: 0644] blob
data/Makefile.am diff | blob | history
data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in [new file with mode: 0644] blob
libempathy/Makefile.am diff | blob | history
libempathy/empathy-tp-streamed-media.c [new file with mode: 0644] blob
libempathy/empathy-tp-streamed-media.h [new file with mode: 0644] blob
po/POTFILES.in diff | blob | history
src/Makefile.am diff | blob | history
src/empathy-av.c [new file with mode: 0644] blob
src/empathy-streamed-media-factory.c [new file with mode: 0644] blob
src/empathy-streamed-media-factory.h [new file with mode: 0644] blob
src/empathy-streamed-media-handler.c [new file with mode: 0644] blob
src/empathy-streamed-media-handler.h [new file with mode: 0644] blob
src/empathy-streamed-media-window-fullscreen.c [new file with mode: 0644] blob
src/empathy-streamed-media-window-fullscreen.h [new file with mode: 0644] blob
src/empathy-streamed-media-window.c [new file with mode: 0644] blob
src/empathy-streamed-media-window.h [new file with mode: 0644] blob
src/empathy-streamed-media-window.ui [new file with mode: 0644] blob
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)