From: <ur...@ke...> - 2009-04-24 09:53:08
|
Module: www Branch: master Commit: dbccf5c53ecabc0b5841f4f7fcc7cadd71088c9c URL: http://cgit.freedesktop.org/gstreamer/www/commit/?id=dbccf5c53ecabc0b5841f4f7fcc7cadd71088c9c Author: Christian Schaller <chr...@co...> Date: Fri Apr 24 10:56:59 2009 +0100 merge branches Merge branch 'master' of ssh://ur...@gi.../git/gstreamer/www Conflicts: planet/config.ini --- |