|
From: | Wolfgang Stradner E |
Subject: | Re: [be] New version 3.1.55 available: Makefile update? |
Date: | Mon, 05 May 2008 10:40:15 +0200 |
User-agent: | Thunderbird 2.0.0.12 (X11/20080227) |
Hi, Wanted to update BE 3.1.44 to 3.1.55 but have a problem with Makefile. How to update it? I checked in Help/Development but did not find any explanation for it. ----------------------------------------- address@hidden:~$ cd bibledit address@hidden:~/bibledit$ git pull remote: Counting objects: 354, done. remote: Compressing objects: 100% (276/276), done. Indexing 277 objects... remote: Total 277 (delta 242), reused 0 (delta 0) 100% (277/277) done Resolving 242 deltas... 100% (242/242) done 67 objects were added to complete this thin pack. * refs/remotes/origin/master: fast forward to branch 'master' of git://git.savannah.nongnu.org/bibledit old..new: fb3c789..203f834 Updating fb3c789..203f834 Makefile: needs update config.log: needs update config.status: needs update desktop/Makefile: needs update doc/.deps/allpages.Po: needs update doc/.deps/contents.Po: needs update doc/Makefile: needs update eeepc/Makefile: needs update man/Makefile: needs update olpc/.deps/bibledit-olpc-libraries.Po: needs update olpc/Makefile: needs update pix/Makefile: needs update scripts/Makefile: needs update src/Makefile: needs update templates/Makefile: needs update tests/Makefile: needs update windows/Makefile: needs update fatal: Entry 'Makefile' not uptodate. Cannot merge. address@hidden:~/bibledit$ teus wrote: merge bug fix resize fix |
wolfgang_stradner.vcf
Description: Vcard
[Prev in Thread] | Current Thread | [Next in Thread] |