Merge branch 'develop' of lyx@10.10.10.29:/home/rockchip/kernel into develop
authorlyx <lyx@rock-chips.com>
Wed, 23 Feb 2011 07:46:34 +0000 (23:46 -0800)
committerlyx <lyx@rock-chips.com>
Wed, 23 Feb 2011 07:46:34 +0000 (23:46 -0800)
commit846c220c428469661d8f9d89be9afd1e0220498f
treeda78e5862bdae348205a6bd52830fb8a804aa04a
parent31238193b4e5a5ff56389a7364db2230f78343e1
parentb1f1924fbee41efbd3a00704440bfc017a78a077
Merge branch 'develop' of lyx@10.10.10.29:/home/rockchip/kernel into develop