merge

Author Jonathan Bell <jbell@cs.columbia.edu>
Author date 2012-01-04 20:47:44
Author local date 2012-01-04 15:47:44 -0500
Committer Jonathan Bell <jbell@cs.columbia.edu>
Committer date 2012-01-04 20:47:44
Committer local date 2012-01-04 15:47:44 -0500
Commit e88a53cc7428dd11ce0bd7a872fa661e198bb6f1
Tree a834651cc9e5d7bdb75b6a2f7a4cbb5b0163649f
Parent 00e284361c23c0d6333380bad4a9cda2bc0921bd
Parent cf0649cab9cb5a2e3ead25d1d6251c12b6853f1f
merge
Affected files:
geworkbench-core/build.xml
geworkbench-core/components/discovery/src/org/geworkbench/components/discovery/.svn/text-base/PatternTableModel.java.svn-base
geworkbench-core/components/discovery/src/org/geworkbench/components/discovery/.svn/text-base/PatternTableModelWrapper.java.svn-base
geworkbench-core/components/discovery/src/org/geworkbench/components/discovery/PatternTableModel.java
geworkbench-core/components/discovery/src/org/geworkbench/components/discovery/PatternTableModelWrapper.java
geworkbench-core/src/org/geworkbench/bison/algorithm/classification/.svn/text-base/CSClassifier.java.svn-base
geworkbench-core/src/org/geworkbench/builtin/projects/.svn/prop-base/ImageFileFilter.java.svn-base
geworkbench-core/src/org/geworkbench/util/.svn/prop-base/ImageFileFilter.java.svn-base