Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix path to version file #37

Closed
wants to merge 1 commit into from
Closed

Fix path to version file #37

wants to merge 1 commit into from

Conversation

seb4stien
Copy link
Contributor

Under windows we can't use the File constructor to build the path to the version file since it uses de "" as path separator.
This fix proposes to hardcode the "/" as path separator.

@seb4stien
Fix path to version file
e4e83a3 
Under windows we can't use the File constructor to build the path to the version file since it uses de "\" as path separator.
This fix proposes to hardcode the "/" as path separator.
@fnatter
Copy link
Contributor

fnatter commented Sep 5, 2014

@seb4stien, @vboerchers: Please do not merge this to master, it should be merged to 1.4.x!
master should always contain released code (that was recently changed).
For more details, see: http://nvie.com/posts/a-successful-git-branching-model/

@vboerchers
Copy link
Contributor

Hi Felix,

as this bug also concerns 1.3.x I'd suggest that I also apply the fix to
1.3.x - Ok?

Regards,
Volker

Am 05.09.2014 um 14:13 schrieb fnatter:

@seb4stien https://github.com/seb4stien, @vboerchers
https://github.com/vboerchers: Please do not merge this to master,
it should be merged to 1.4.x!
master should always contain released code (that was recently changed).
For more details, see:
http://nvie.com/posts/a-successful-git-branching-model/

—
Reply to this email directly or view it on GitHub
#37 (comment).

vboerchers added a commit that referenced this pull request Sep 7, 2014
@vboerchers
manually incorporated pull request #37 by https://github.com/seb4stien
d6612a0
@fnatter
Copy link
Contributor

fnatter commented Sep 7, 2014

@vboerchers: Yes, sure, it's low risk.
However, do we need a new 1.3.12RC with this included or is it enough to include it in 1.3.13
(see http://sourceforge.net/p/freeplane/discussion/758437/thread/2fbb81ca/)?

@vboerchers
Copy link
Contributor

I think it would be better to include it into 1.3.12 since 1.3.13 will
take quite while to get published, right? But I have no doubt that the
fix is safe so I doubt that we need another RC...

Am 07.09.2014 um 15:29 schrieb fnatter:

@vboerchers https://github.com/vboerchers: Yes, sure, it's low risk.
However, do we need a new 1.3.12RC with this included or is it enough
to include it in 1.3.13
(see
http://sourceforge.net/p/freeplane/discussion/758437/thread/2fbb81ca/)?

—
Reply to this email directly or view it on GitHub
#37 (comment).

@fnatter
Copy link
Contributor

fnatter commented Sep 8, 2014

Yes, agreed.

vboerchers added a commit that referenced this pull request Sep 8, 2014
@vboerchers
manually incorporated pull request #37 by https://github.com/seb4stien
2a23aa2
@vboerchers
Copy link
Contributor

Merged from 1.4.x to 1.3.x:
2a23aa2ccf74

@vboerchers vboerchers closed this Sep 8, 2014
dpolivaev pushed a commit that referenced this pull request Apr 17, 2016
Squashed release-1.3.12
602b98a 
commit dbdd2c0
Author: dpolivaev <dpolivaev>
Date:   Tue Sep 16 20:59:01 2014 +0200

    add Application-Library-Allowable-Codebase attribute to manifest

commit 9c22c3d
Author: dpolivaev <dpolivaev>
Date:   Tue Sep 16 20:48:35 2014 +0200

    use value.toUpperCase(Locale.ENGLISH) in LinkBuilder

commit 8866344
Author: dpolivaev <dpolivaev>
Date:   Tue Sep 16 20:45:55 2014 +0200

    build should use external key store

commit 5cb003b
Author: Felix Natter <fnatter@gmx.net>
Date:   Sat Sep 13 13:04:32 2014 +0200

    fix OptionPanel.tr (Turkmen->Turkish)

commit 9ee5003
Author: Volker Boerchers <boercher@web.de>
Date:   Fri Sep 12 01:56:34 2014 +0200

    update history file

commit 0441e4f
Author: Volker Boerchers <boercher@web.de>
Date:   Mon Sep 8 20:44:25 2014 +0200

    fix bug #2186: use fixed locale for toUpperCase to cope with
    the http://mattryall.net/blog/2009/02/the-infamous-turkish-locale-bug

commit c149fdd
Author: dpolivaev <dpolivaev>
Date:   Wed Sep 10 13:04:36 2014 +0200

    history

commit 2a23aa2
Author: Volker Boerchers <boercher@web.de>
Date:   Sun Sep 7 14:41:47 2014 +0200

    manually incorporated pull request #37 by https://github.com/seb4stien
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@seb4stien @fnatter @vboerchers