[lyx/f14/master: 8/8] Merge changes with master, the previous commit to this branch was made under the assumption that I w

[José Abílio Oliveira Matos]

commit 7c260c217bb39d699c09560508bf25312cf65f62
Merge: 808ab39 3eb75e7
Author: José Matos <jamatos at fedoraproject.org>
Date:   Fri Mar 11 19:35:30 2011 +0000

    Merge changes with master, the previous commit to this branch was made under the assumption that I was working on master, my bad :-(

 lyx-2.0.0beta3-gcc46.patch                         |   11 ------
 ...3-xdg_open.patch => lyx-2.0.0rc1-xdg_open.patch |   34 ++++++++++----------
 lyx.spec                                           |   20 +++++++----
 3 files changed, 30 insertions(+), 35 deletions(-)
---