← Back to branch summary

~ludwig.schmidt/jhelioviewer/jhv-jp-merge

~ludwig.schmidt/jhelioviewer/jhv-jp-merge

Viewing all changes in revision 6.

Committer: Ludwig Schmidt
Date: 2009-08-26 19:50:40 UTC
Revision ID: ludwigschmidt2@gmail.com-20090826195040-lt91wmsjbbl0hf9g

first merge step

files modified:
src/org/helioviewer/base/math/Interval.java

src/org/helioviewer/jhv/concurrency/ReasonSignal.java

src/org/helioviewer/jhv/io/Settings.java

src/org/helioviewer/jhv/io/jpip/JPIPConstants.java

src/org/helioviewer/jhv/io/jpip/JPIPSocket.java

src/org/helioviewer/jhv/kakadu/JHV_Kdu_cache.java

src/org/helioviewer/viewmodel/JP2Image.java

src/org/helioviewer/viewmodel/JP2ImageView.java

src/org/helioviewer/viewmodel/JP2ImageViewParameter.java

Show diffs side-by-side

added added

removed removed

src/org/helioviewer/base/math/Interval.java

src/org/helioviewer/jhv/concurrency/ReasonSignal.java

src/org/helioviewer/jhv/io/Settings.java

src/org/helioviewer/jhv/io/jpip/JPIPConstants.java

src/org/helioviewer/jhv/io/jpip/JPIPSocket.java

src/org/helioviewer/jhv/kakadu/JHV_Kdu_cache.java

src/org/helioviewer/viewmodel/JP2Image.java

src/org/helioviewer/viewmodel/JP2ImageView.java

src/org/helioviewer/viewmodel/JP2ImageViewParameter.java

Older »