Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

#173 move VFS Browser shortcuts from gui props to keymap and remo

for 5.0.x
closed-accepted
Alan Ezust
None
5
2012-10-14
2012-09-28
Björn Kautler
No

r22232

Discussion

  • Alan Ezust
    Alan Ezust
    2012-10-13

    trying to merge this results in conflict of entire file for jedit_cs.props as well as jedit_fr.props.

     
  • Alan Ezust
    Alan Ezust
    2012-10-13

    • status: open --> pending-remind
     
  • I guess svn:eol-style was set to native after branching 5.0.x. See this:
    http://jedit.svn.sourceforge.net/jedit/?view=rev&rev=22322
    I did this commit on 5.0.x to make merging of my request (and others as well) easier. But I did only a precise one-file cut.

     
  • Alan Ezust
    Alan Ezust
    2012-10-14

    • status: pending-remind --> open
     
  • Alan Ezust
    Alan Ezust
    2012-10-14

     
  • Alan Ezust
    Alan Ezust
    2012-10-14

    how do I merge it without clobbering the whole file though? Since it is all international stuff I can't really test/verify that I did things correctly otherwise.

     
  • Alan Ezust
    Alan Ezust
    2012-10-14

    Ah nevermind, all I had to do was propset the file before the merge.

     
  • Alan Ezust
    Alan Ezust
    2012-10-14

    • assigned_to: nobody --> ezust
    • status: open --> closed-accepted