From: <no...@gi...> - 2011-12-06 14:26:01
|
Branch: refs/heads/2.5.x Home: https://github.com/bioclipse/bioclipse.core Commit: 30503415dacafb2c2aaffe7108d0fde3d9bec8c8 https://github.com/bioclipse/bioclipse.core/commit/30503415dacafb2c2aaffe7108d0fde3d9bec8c8 Author: Arvid Berg <gog...@us...> Date: 2011-12-06 (Tue, 06 Dec 2011) Changed paths: M plugins/net.bioclipse.core.tests/src/net/bioclipse/core/tests/AbstractManagerTest.java R plugins/net.bioclipse.core/src/net/bioclipse/core/domain/Dataset.java A plugins/net.bioclipse.core/src/net/bioclipse/core/domain/DenseDataset.java A plugins/net.bioclipse.core/src/net/bioclipse/core/domain/IDataset.java M plugins/net.bioclipse.core/src/net/bioclipse/core/domain/SMILESMolecule.java A plugins/net.bioclipse.core/src/net/bioclipse/core/domain/SparseDataset.java M plugins/net.bioclipse.ui.business/src/net/bioclipse/ui/business/IUIManager.java M plugins/net.bioclipse.ui.business/src/net/bioclipse/ui/business/UIManager.java Log Message: ----------- Merge branch 'master' into 2.5.x Conflicts: net.bioclipse.target.platform/target-platform.target plugins/net.bioclipse.core.tests/src/net/bioclipse/core/tests/AbstractManagerTest.java |