# HG changeset patch # User Raphael Velt # Date 1323883388 -3600 # Node ID 97c082990f8d931e4a63fed2ca38aae56c9abbc1 # Parent 4141c5821c98ba58e5d6cb8569b495ad13f6bb94# Parent bf5cf5a9e737e6a8c210a7a4c3f6a57ec0c08647 Merge with facc7cc5c7f0457ee36d5d71b3fc93e363348032 diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/config.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/css/style.css diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/arrow.png diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/arrowtop.png diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/bgd.jpg diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/bgdeplie.png diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/bgnoarrow.png diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/head_logo.gif diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/menu_underline.gif diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/placeholder.png diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/img/searchcancel.png diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/index.html diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/js/live-polemic.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/lib/jquery-1.6.4.min.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/lib/jquery.mousewheel.min.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/lib/raphael-min.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/client/lib/underscore-min.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/server-nodejs/conf.js diff -r bf5cf5a9e737 -r 97c082990f8d tweetcast/server-nodejs/tweetcast.js diff -r bf5cf5a9e737 -r 97c082990f8d web/client.php --- a/web/client.php Wed Dec 14 12:46:53 2011 +0100 +++ b/web/client.php Wed Dec 14 18:23:08 2011 +0100 @@ -48,7 +48,7 @@ Live Video and Annotation - + ' rel='stylesheet' type='text/css'> @@ -71,11 +71,17 @@