Permalink
Commits on Aug 3, 2012
  1. Merge remote-tracking branch 'origin/lav_http_muxing' into transcode

    john-tornblom committed Aug 3, 2012
    Conflicts:
    	configure
    	src/tvheadend.h
    	src/webui/webui.c
    	support/configure.inc
  2. fix gcc-4.6 warning

    john-tornblom committed Aug 3, 2012
  3. cosmetics

    john-tornblom committed Aug 3, 2012
  4. cleaning and cosmetics

    john-tornblom committed Aug 3, 2012
  5. cosmetics

    john-tornblom committed Aug 3, 2012
Commits on Aug 2, 2012
  1. Merge branch 'lav_http_muxing' of github.com:john-tornblom/tvheadend …

    john-tornblom committed Aug 2, 2012
    …into lav_http_muxing
    
    Conflicts:
    	src/webui/lav_muxer.c
  2. cosmetics

    john-tornblom committed Aug 2, 2012
  3. cosmetics

    john-tornblom committed Aug 2, 2012
  4. cosmetics

    john-tornblom committed Aug 2, 2012
  5. cosmetics

    john-tornblom committed Aug 2, 2012
  6. Merge remote-tracking branch 'upstream/master' into transcode

    john-tornblom committed Aug 2, 2012
    Conflicts:
    	src/main.c
    	src/webui/webui.c