← Back to branch summary

~frederic-cote/me-tv/1.4

~frederic-cote/me-tv/1.4

Viewing all changes in revision 58.

Committer: Frédérick Côté
Date: 2015-04-04 04:39:27 UTC
mfrom: (57.1.3 me-tv)
Revision ID: frederick.cote@gmail.com-20150404043927-0vusde12qvi57480

Merge from Christian branch

files added:
client/inhibitscreensaver.cc

client/inhibitscreensaver.h

files modified:
client/Makefile.am

client/main_window.cc

client/main_window.h

client/me-tv-client.1

client/me-tv-client.cc

client/me-tv.cc

client/me-tv.h

configure.ac

server/channel_manager.cc

server/channel_manager.h

server/me-tv-server.1

server/request_handler.cc

Show diffs side-by-side

added added

removed removed

client/Makefile.am

client/inhibitscreensaver.cc

client/inhibitscreensaver.h

client/main_window.cc

client/main_window.h

client/me-tv-client.1

client/me-tv-client.cc

client/me-tv.cc

server/channel_manager.cc

server/channel_manager.h

server/me-tv-server.1

server/request_handler.cc

Older »