diff options
author | Timothy Pearson <[email protected]> | 2013-02-06 19:49:08 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-06 19:49:08 -0600 |
commit | 868c146fd385af6c8ee13c5759cc58d1af1b5c9a (patch) | |
tree | 5fd74ca59310f668a46954b12ba170e755f3da1b /libreoffice/git_10_28_2011 | |
parent | 8c5f73ae48a29b136425255cb6cbecb5470f7f1a (diff) | |
download | thirdparty-868c146fd385af6c8ee13c5759cc58d1af1b5c9a.tar.gz thirdparty-868c146fd385af6c8ee13c5759cc58d1af1b5c9a.zip |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/git_10_28_2011')
-rw-r--r-- | libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index 9423239..17dcc45 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -9345,10 +9345,10 @@ index 0000000..eb20aa3 +// Main +////////////////////////////////////////////////////////////////////////// + -+static KCmdLineOptions sOptions[] = ++static TDECmdLineOptions sOptions[] = +{ + { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, -+ KCmdLineLastOption ++ TDECmdLineLastOption +}; + +int main( int argc, char* argv[] ) |