Ignore:
Timestamp:
11/30/12 16:15:30 (17 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
11215:a55eaa72e6ef (diff), 11045:a66a74b38e91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged from upstream (biolab/orange).

Files:
2 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.