Am Donnerstag, 11. Juli 2013 um 13:11:18, schrieb Scott Kostyshak <skost...@lyx.org> > On Tue, Jul 9, 2013 at 3:08 PM, Kornel Benko <kor...@lyx.org> wrote: > > It turned out, the problem is the link-stage. The (needed) library libXMU > > > > is added automatically by the gnu-cc in case of ubuntu 12.04, but not > > > > in case of ubuntu 13.04. > > > > > > > > The attached patch for development/autotests/CMakeLists.txt worked on both > > platforms. > > > > > > > > Ok to commit to 2.1-staging? > > Yes, please do. I have tested it on Ubuntu 13.04 and it works well. > > Scott
Done, but I am confused about the the result of push:X11 forwarding request
failed on channel 0
# git push
To g...@git.lyx.org:lyx
! [rejected] master -> master (non-fast-forward)
Would set upstream of '2.1-staging' to '2.1-staging' of 'origin'
error: failed to push some refs to 'g...@git.lyx.org:lyx'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
Exit 1
Kornel
signature.asc
Description: This is a digitally signed message part.
