Changeset 9944:3dbc10862da3 in orange for Orange/__init__.py


Ignore:
Timestamp:
02/07/12 19:19:21 (2 years ago)
Author:
blaz <blaz.zupan@…>
Branch:
default
Children:
9945:ba7e22d4ebc5, 9963:7598327495d7
Parents:
9943:364085431ea7 (diff), 9942:32d14842ffc7 (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:

Resolved conflicts in discretization.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Orange/__init__.py

    r9929 r9944  
    1919_import("data.io") 
    2020_import("data.sample") 
     21_import("data.discretization") 
    2122 
    2223_import("network") 
  • Orange/__init__.py

    r9943 r9944  
    1919_import("data.io") 
    2020_import("data.sample") 
    21 _import("data.variable") 
    2221_import("data.discretization") 
    2322 
Note: See TracChangeset for help on using the changeset viewer.