Skip to content

Commit f055bbf

Browse files
Nikolay SamusikNikolay Samusik
authored andcommitted
Merge origin/master
Conflicts: build.xml nbproject/build-impl.xml nbproject/genfiles.properties nbproject/project.xml
1 parent f0e4f1e commit f055bbf

34 files changed

+0
-5435
lines changed

vortex/src/vortex/gui/Bundle.properties

Lines changed: 0 additions & 14 deletions
This file was deleted.

vortex/src/vortex/gui/ClusterBrowser.form

Lines changed: 0 additions & 49 deletions
This file was deleted.

vortex/src/vortex/gui/ClusterBrowserPane.form

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)