Sun, 16 Sep 2007 18:47:12 +0000 |
Richard Laager |
Make my currentmedia changes compile.
|
Sun, 16 Sep 2007 18:34:58 +0000 |
Richard Laager |
Remove some #if 0'ed code.
|
Sun, 16 Sep 2007 18:34:36 +0000 |
Richard Laager |
Remove "Has you", which has been gone in trunk for a while.
|
Sun, 16 Sep 2007 18:18:37 +0000 |
Richard Laager |
Use the mediaNode variable rather than the psmNode again. This is from a
|
Sun, 16 Sep 2007 18:11:54 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin' (head 5a3c2bb6d5725a73e614aa69d0e5beb04aba2d19)
|
Sun, 16 Sep 2007 18:10:12 +0000 |
Richard Laager |
propagate from branch 'im.pidgin.pidgin' (head b0967247f79b18b245cdaaaf3f803d6834aea19a)
|
Sun, 16 Sep 2007 18:07:46 +0000 |
Richard Laager |
explicit merge of '5d4b00a88466bb9e851eaca42ab3fd3f2c4093ef'
|
Sun, 16 Sep 2007 18:07:27 +0000 |
Richard Laager |
explicit merge of '753ac22f1fb1d33ecd437bdc3c63ca4f5bd81514'
|
Sun, 16 Sep 2007 18:06:22 +0000 |
Richard Laager |
explicit merge of '7ca52e5d60c8f4d7842faad73378b57df9db9007'
|
Sun, 16 Sep 2007 18:05:55 +0000 |
Richard Laager |
explicit merge of '46d8a45835e685c9dd812f5c6c0df074388bec8a'
|
Sun, 16 Sep 2007 18:05:12 +0000 |
Richard Laager |
explicit merge of '496506f552dcc01dcc38820f472dc9d27a82a997'
|
Sun, 16 Sep 2007 18:03:53 +0000 |
Richard Laager |
explicit merge of 'd565bd9a8e62d3302ac14bb7c3a68a52c0c6a65e'
|
Sun, 16 Sep 2007 18:03:41 +0000 |
Richard Laager |
explicit merge of '736907efe1b492215cd5e4b57bbcec0d4bb977e6'
|
Sun, 16 Sep 2007 18:02:50 +0000 |
Richard Laager |
explicit merge of '3732a7eabc7ecb0f846edc60f04ec3f6f7779c5b'
|
Sun, 16 Sep 2007 18:01:18 +0000 |
Richard Laager |
explicit merge of '996cf0c57149ba6e1c714ebb1f11d5d4bac8fb68'
|