ïnitial commit
Squashed commit of the following:

commit a7bfbc58d6cc53ab8019ca4f271f0188e3476e83
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat May 17 17:43:45 2014 +0200

    updated to scala 2.11

commit 7236b3029018cb500f36f162a21c5db7f52930f7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 9 13:03:58 2014 +0200

    beautifications

commit 45ce6dd503e272a148bef57c9f85bc449d6d4a38
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Apr 30 18:15:56 2014 +0200

    fixed removal bug

commit 571a18730cffdc4d2e1115b375e7f40a39063528
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Apr 24 17:48:39 2014 +0200

    updated structure

commit 36b710fb75f35dd594dcd37e2fa981b41f7ed89e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 22 12:14:55 2014 +0200

    updates for integration

commit 5a6576b334cc7bac2f7e0815b3c55156b9787ad1
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun Apr 6 23:14:24 2014 +0200

    Flaot setter

commit ccd69fb525d2e1b8a03f39a4098bc8aed732dbdd
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Feb 26 18:59:40 2014 +0100

    fixed println

commit 3c7aea147bf029e168d6d2f94c039d136471bbfa
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 25 19:18:25 2014 +0100

    Bug fix

commit 4bc6ef67b29c1501832a8ae2659d0a37f2343c15
Merge: fd06269 07711b8
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Feb 5 12:38:06 2014 +0100

    Merge branch 'win9148.informatik.uni-wuerzburg.de/master'

commit 07711b88ba450bc57a923bd9a317b1933d55c33f
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Feb 5 12:32:13 2014 +0100

    Added file setter

commit fd06269fcdb6cb51e993f65faa5bed4feb4ab4bd
Merge: 3e87792 8275a7c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Jan 31 19:01:22 2014 +0100

    Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit 3e87792b4e8a8df06f649f0924490f34ebdf5f2c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Jan 31 19:01:20 2014 +0100

    updated event system

commit 8275a7c2e8e846a4cb8a655d8366f91907ea4c42
Merge: f32a89b 92c6707
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Jan 31 16:51:21 2014 +0100

    Merge branch 'win9148.informatik.uni-wuerzburg.de/master'

commit 92c67074941e04ef15ef146c82545c63eb040040
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Jan 31 16:49:00 2014 +0100

    Updated editor configuration to support event disabling

commit 053ce073449c102696999074184cc5411e2db9dc
Author: martin <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Jan 31 14:58:40 2014 +0100

    Fixed edit function for windows

commit 2c30c89eeea8da7db338a01c12a6728791a02408
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Jan 31 11:36:24 2014 +0100

    Fixed a dynamic reloading bug and a auto generate bug

commit f32a89bfff57d5cc0c55347bc1f002e3e78f693b
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Jan 30 18:32:53 2014 +0100

    Merged with win9148

commit 2f95ca8ad74e8190300efa834a1e31cc2b8b8c62
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Jan 27 17:46:18 2014 +0100

    Updated for machine-learning course

commit 855d57540d672f15638fdc235e2db422ea33b342
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Jan 22 18:14:24 2014 +0100

    Fixed bug that occured when too many events were emitted

commit fa1ca6ef1d9f9f5116c9363878b704e488882b45
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Jan 22 16:47:21 2014 +0100

    Fixed event entities and debug mode

commit f5bb716631cb5190be0944e0d4a8fbf7fb14e4d2
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Jan 21 15:52:38 2014 +0100

    Added cv component example

commit bb92949d548eea7bc34e5e4ef626f17212fcef7a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Dec 29 14:05:32 2013 +0100

    updated typeinfo to use grounded symbols only

commit 45b8f36ea7a97c55e395ab6766dd4c0dcbbdd13d
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Dec 13 18:27:42 2013 +0100

    Wip (evet support for editor)

commit 30b5251cc241041f3edebdc11badf25c2650ae89
Merge: fca044f 254be00
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Dec 13 15:54:31 2013 +0100

    Merge branch 'origin/master'

commit fca044f687c7ed387c945ea5f75f82e7825143fc
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Dec 13 15:53:35 2013 +0100

    events

commit 254be0020d4ddf180e5e5ee753f2ddf7a6397956
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Dec 13 15:45:21 2013 +0100

    update

commit 78d6529af98a93f875737fa008e2b203983ebd77
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Dec 12 23:11:20 2013 +0100

    reworked svar typesystem

commit 0b88e2680b969c118a6aca6dccc8933964dfe93c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Dec 12 19:53:17 2013 +0100

    commit in between

commit c2a8c0ff319ac0576c431cdccd4a06c68e414a41
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Dec 10 14:34:23 2013 +0100

    fixed double registration bug

commit d921836cfed54d0973427f4cd4b3e1f3270f7b1a
Merge: 184ad7e 3fc7eda
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun Dec 1 17:38:03 2013 +0100

    Merge branch 'origin/master'

    Conflicts:
    	ivy.xml

commit 184ad7e816662d29150e75eec117ce90a4f8fbc9
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun Dec 1 17:37:06 2013 +0100

    fixed bug

commit 3fc7eda8c1844a4b36899c34f594eb807c986b1a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 29 20:05:38 2013 +0100

    added component config layer

commit 379730516b48e38857f104f4f4e9c479fcf57399
Merge: ce9ad2e f353101
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 28 22:04:30 2013 +0100

    Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit ce9ad2ea113355f35424fd548cb301c099329b34
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 28 22:04:28 2013 +0100

    cleanup

commit f353101eb34e1249a4e216635466ec19259b2830
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Nov 28 19:26:19 2013 +0100

    -> swing 2.10.3

commit 0820b23c3e92134fc1ae9f92acce5aa8190328cc
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 21 20:12:15 2013 +0100

    more on component entities

commit f97dbc608118c660683b2035bd959591db80ed6b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 21 16:28:02 2013 +0200

    update

commit e6f60a5a856e52d52821dffceb0bd9baa5568bfb
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 21 16:19:51 2013 +0200

    update

commit 691a5a4791fcc9019904b455c9fbdb0859363887
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Sep 12 18:02:26 2013 +0200

    Added new features

commit e9d2e2fb8f8593a0d84229cc7f16272b88addd84
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Sep 11 19:28:44 2013 +0200

    Added boolean view

commit 9e15f9be01120d1456b2315eb30d78c60f5d0a66
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Sep 10 09:14:27 2013 +0200

    TypeTag->ClassTag

commit 8e4fa38f46fea5b62957046434c0481e7a028082
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Sep 5 15:58:05 2013 +0200

    Continued feature component

commit bed0b4b6fe3ab35cc49db39058f309a94c0bbabb
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Sep 4 18:10:30 2013 +0200

    Continued feature component

commit 3226553f20fa3beefb7ceebdcdd2dd4f8e8f9a5b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 2 15:46:36 2013 +0200

    updated settings

commit dbbac60b9c6f4ca03ced9cd43c68e54fe2c3ab9e
Merge: b0a6b76 e6b0696
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Aug 30 16:56:46 2013 +0200

    Merge branch 'scala-2.10-upgrade' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor into scala-2.10-upgrade

    Conflicts:
    	src/simx/components/editor/gui/SVarSetter.scala
    	src/simx/components/editor/gui/SVarSetterPanel.scala
    	src/simx/components/editor/gui/TreeNodeVisualisations.scala

commit b0a6b767ff488ca81123956d46238c81ea0571e6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Aug 30 16:47:02 2013 +0200

    ...

commit e6b0696f37414ea57a55c05ea66a18ef22a04cfe
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Aug 30 16:06:52 2013 +0200

    Fixed a bug that occured when closing the editor window and the editor settings were written
    Added feature: Multiple SVarViews/SVarSetter

commit 68f130bfe6b011a8ab00228f3afd58386f2551fd
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Aug 30 12:48:42 2013 +0200

    Finished editor adaptions
    Cleanup

commit 8197c9235f1f46f8e3e8313c18479072aa22cff4
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Aug 29 19:25:22 2013 +0200

    Continued fixing the editor

commit 37c99be68f61a688d371d4e5f3e01d502975810f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 10:39:56 2013 +0200

    cleanup

commit 96ab168e8210572d3e8a24efb0ec4ee0ae1e5ef6
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Aug 26 17:28:14 2013 +0200

    Started repairing the editor after 2.10 upgrade

commit 93f774b58db91d054c406b0cce2dbdd804fe4554
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 12 11:11:39 2013 +0200

    cleanup

commit b6a1d6f7df40ccc191c7a582e0fa8dd69f0580f3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 7 18:45:48 2013 +0200

    scala 2.10 again

commit 46a32c539a712bf744f5bcf87fd5f9e0ff3b4b55
Merge: 4db5c2c 389b044
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sat May 18 17:56:53 2013 +0200

    Merge remote-tracking branch 'refs/remotes/origin/master'

commit 4db5c2c345ae8090fd08ad940034edb918245625
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sat May 18 17:56:22 2013 +0200

    Added FontChooser,
    Added ConstVec2f Setter

commit 389b04460719d7ef121f5c4f2ff05815c49dac71
Merge: 8e195d8 9ea13a5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 10:40:26 2013 +0200

    Merge branch 'github-release'

commit 9ea13a5438fe56f78441b2eca401b53336533608
Merge: 85f6936 95f8a7f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:53:56 2013 +0200

    Merge branch 'master' by siris-team

commit 8e195d837b4ed87c2715009895b81ac733e066e6
Merge: 1ba3782 140232a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:53:56 2013 +0200

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit 85f6936d0f9a7be1cd838f84da80281ba3157dd5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:53:52 2013 +0200

    updated svallist to svalset

commit 1ba378281f6ae09e87d172064022c94331621533
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:53:52 2013 +0200

    updated svallist to svalset

commit 140232a31d81ca426fb5b599723d38a4a0c668eb
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun May 12 15:30:07 2013 +0200

    Added "string"-filechooser

commit 95f8a7f5163a1c5c42724725419c76082f5f53f7
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun May 12 15:30:07 2013 +0200

    Added "string"-filechooser

commit 07d4d1af00b483491462c6d4da302fc9d9338279
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun May 12 13:56:48 2013 +0200

    Added String Setter

commit 87dee257e89462a05a348419c9f26a2f2ef5ff57
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun May 12 13:56:48 2013 +0200

    Added String Setter

commit abd35aec24f0778b4347ccdc792f5a159874ffd5
Merge: 4b0d448 be61fa4
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 15:27:31 2013 +0200

    Merge remote-tracking branch 'refs/remotes/origin/github-release'

    Conflicts:
    	src/simx/components/editor/Editor.scala
    	src/simx/components/editor/EditorConfiguration.scala
    	src/simx/components/editor/MessagesAndEvents.scala
    	src/simx/components/editor/filesystem/DynamicReloader.scala
    	src/simx/components/editor/filesystem/SirisProperties.scala
    	src/simx/components/editor/gui/AdvComboBox.scala
    	src/simx/components/editor/gui/AdvTree.scala
    	src/simx/components/editor/gui/DetailsView.scala
    	src/simx/components/editor/gui/EditorOptionsPanel.scala
    	src/simx/components/editor/gui/EditorPanel.scala
    	src/simx/components/editor/gui/SVarSetter.scala
    	src/simx/components/editor/gui/SVarSetterPanel.scala
    	src/simx/components/editor/gui/SVarView.scala
    	src/simx/components/editor/gui/SVarViewPanel.scala
    	src/simx/components/editor/gui/SynchronizedReactor.scala
    	src/simx/components/editor/gui/TreeNode.scala
    	src/simx/components/editor/gui/TreeNodeVisualisations.scala
    	src/simx/components/editor/gui/VideoCapture.java
    	src/simx/components/editor/tests/ExchangeableDisplayTest.scala
    	src/simx/components/editor/tests/FileComponentGenerator.scala
    	src/simx/components/editor/tests/MinorTests.scala
    	src/simx/components/editor/tests/MyBaseClass.scala
    	src/simx/components/editor/tests/ScalaTreeTest.scala
    	src/simx/components/editor/tests/SimpleTreeTest.scala
    	src/simx/components/editor/tests/SimpleTreeTestWithAdjustedTree.scala
    	src/simx/components/editor/tests/VideoTest.scala
    	src/simx/components/editor/tests/abcFileComponentGenerator.scala

commit be61fa4c2865578f21cc2ec4431d013ca4552928
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Mar 28 23:57:17 2013 +0100

    initial_commit

commit 4b0d448de6e2343918589728e5c473af0561691b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Mar 15 17:26:29 2013 +0100

    renamings

commit 9a6063b7a9be587564a78de6d82b4e444ce5d6c4
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Mar 13 10:07:05 2013 +0100

    GreenIT

commit 73845885b259d80c6c7a2dfd24d67e88e6e9d8a2
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Mar 13 09:59:00 2013 +0100

    Fixed bug coming from ontology update

commit 89d70815618e6a3b50d47b98d3604ea076801fda
Merge: 1bc4c4d b19ecfd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 16:01:00 2013 +0100

    Merge branch 'akka-migration-dennis'

commit b19ecfd012ed87bee422463cc697bbd329349478
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 16:00:51 2013 +0100

    using project sdk

commit 451b6a1fe8dd803b85c9300781e057d640e63349
Merge: 0565896 2ffc415
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 09:47:11 2013 +0100

    Merge branch 'akka-migration-dennis' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor into akka-migration-dennis

commit 0565896c6a3e6e02e61c13a3380fda61dfbc0c6c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 09:46:59 2013 +0100

    renamed IEntityDescription to GeneralEntityDescription

commit 2ffc4156db9191e62ad213d8c65e9d2e29347450
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Mar 7 09:37:25 2013 +0100

    - Fixed library

commit 1bc4c4da4be61f407d89773d05665743b423644b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 5 19:28:07 2013 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit dbc21668f9e4e67267beb0060b7bf3aa22d0e14a
Merge: e98badd 0ba7ee7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 5 19:26:32 2013 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit e98badda5a2150cb01462e99b2a32a982b1af0ed
Merge: e3128a9 2fb0e27
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 5 19:06:42 2013 +0100

    Merge remote-tracking branch 'refs/remotes/origin/akka-migration' into HEAD

commit 4a84e816d2eb61936684323e2cbb4dc387c8d065
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Feb 28 16:06:37 2013 +0100

    minor fix

commit 48178714b52d797f88a00bbe7e8a36cd1a91648c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 27 21:48:57 2013 +0100

    started switch to akka

commit 0ba7ee7be10ffc568c0f2cc02a00aa1977ce72ac
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 15:34:49 2013 +0100

    Some work on the migration

commit 2fb0e273e08b1448bbe2af60fdbbc988d0312338
Merge: f4ed65a 1729861
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:32:55 2013 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit f4ed65a2be16243e85b8c1f6b94423fb632bedf1
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:26:18 2013 +0100

    - changes

commit e3128a9f2092a1de9c17182b3af076ab9e65323e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Feb 24 00:20:56 2013 +0100

    cleanup

commit 17298615c128c0f76a8376e3988221c72c71b27b
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 17:06:10 2013 +0100

    Removed scala version dependency in sbt output path and in .iml files

commit 839393db993ae8d3ea76be97a01c1cbb97873c61
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 16:01:02 2013 +0100

    Removed hard wired scalaVersion from sbt files.
    The sbt version is now configurable in the main Build.scala and referenced in the local .sbt files.

commit d4cd0800fde08326bd653ba8b22f9df7ab9d09ec
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Feb 18 18:29:54 2013 +0100

    Fixed a tree example

commit c39a4013914f1452e45ca01ecaeb22d786baede7
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Feb 15 10:34:24 2013 +0100

    Adepted TuioExample and ExampleApplication, removed PhysicsEditorExample
    Improved Configurations usage and error handling

commit 3fca94baa9425fb95e8524dcfbf327a064568b8f
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Feb 14 17:28:44 2013 +0100

    Fixed missing files error

commit 67201efbe8d672a71af0d97cabb4c278738eff4c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Jan 19 17:16:13 2013 +0100

    removed old import

commit 33c67e3b91b0dff472d5af766849a016df852271
Merge: 0812367 762d4e1
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Dec 23 08:32:07 2012 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor

commit 08123678a699110fb4d44cbf8a4710f7a74b9afd
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Dec 23 08:27:59 2012 +0100

    -

commit 762d4e166b0e40931f4dfd1dcaf8efa03d3dfb7c
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Dec 6 17:43:55 2012 +0100

    Change cfg

commit a29a290afe4486eb29b9eafa841f3ad4c3e72b89
Author: martin <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Dec 5 16:37:16 2012 +0100

    Continued editor fix

commit 012df6a33e7cddec69cb70356b2d8d5c08ffaf90
Author: martin <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Dec 5 13:47:23 2012 +0100

    Windows fix

commit 9c480504aa9ae529065d986069258995cfe1c890
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Dec 5 12:27:50 2012 +0100

    Continued editor fix

commit d5c993a44980278e24c9d1c7342dc4e2a2bafe17
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Oct 21 12:32:49 2012 +0200

    - Removed Plugable Sync layer

commit c0d0aff0f182c8518a3021db74ef072b50dcff23
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 19 09:51:05 2012 +0200

    - Renamed package from siris to simx

commit edbab729b9002737147ed9cd142fb141afc4d753
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 16:18:39 2012 +0200

    - Removed SVarActorLW

commit c4fdfdd01a7fc4eee11086a019beea0881e75d9d
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 15:44:06 2012 +0200

    - Removed SVarActorHW and SVarActorImpl

commit 3056a8e8deb48818b5ececd2da31bd11f5036586
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 14:36:36 2012 +0200

    - Using the complete function

commit c53fe370df978cf437ac2a3d3f527fd7916b2358
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 11:26:00 2012 +0200

    - Implemented new interface function

commit 5c993c4779367bcbdadc4620944bc60018ce015a
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Oct 10 11:46:00 2012 +0200

    - Restructured libraries

commit 7ac7921ce2a867629521a974bfb576b7d1797a95
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Sep 22 15:07:48 2012 +0200

    - libraries

commit 9e8948d9f734d6e79b5c464eb9e8355ca5f48f4c
Merge: c11bd41 e6d60a3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Sep 1 00:56:56 2012 +0200

    Merge branch 'simthief-repair'

commit c11bd4161ebb3cb41870cf488cff1e7af0fa443d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Sep 1 00:56:48 2012 +0200

    ...

commit e6d60a35875c435df262d5983d479f5b00958dd2
Merge: e1eec8d 3ff5d41
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 22 13:18:10 2012 +0200

    Merge branch 'simthief-repair' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/editor into simthief-repair

commit e1eec8ddecb91a2036a7fb2cffdc58f8375bd5d5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 22 13:17:58 2012 +0200

    commit before re-implementation of ghost behavior

commit 3ff5d41d425caae6e87a76c219df7dfa894459da
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Jul 31 12:39:27 2012 +0200

    Implemented a new svarview for the editor

commit 1b5779cc4a846aae951199f73e9eeeea6e0d60f2
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Jul 30 14:28:04 2012 +0200

    Removed sbt temp files

commit b5e2c10bc8f66ac768382dfe140718a2677b9dd6
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Jul 4 16:56:31 2012 +0200

    Restored the editor component.
    Some GreenIT.
    Added the editor to a bsic example.

commit 32510d0ec1c268d4c0a0bd6556afa84fc1e0df01
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Jul 4 16:55:43 2012 +0200

    Added .gitignore

commit 4674bd2d3bf095826acfeaac821c9a35315f1bb6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Jun 26 17:23:06 2012 +0200

    removed comment

commit 50edee1e0afbcca9c921d635c273aa6b63b9b04c
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Jun 26 17:20:39 2012 +0200

    Test

commit 1cb019c1ab0cbcd64e033df0c5acf530155bebd5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 22 12:44:32 2012 +0200

    Revert "..."

    This reverts commit f0081d6cf5034754d4d9cfa1dc57ff819867aaea.

commit ff2fe13db44f827eb96c6c02002ea0ae3ed9fea0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 18 17:13:21 2012 +0200

    simthief does compile again

commit f0081d6cf5034754d4d9cfa1dc57ff819867aaea
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 16:42:35 2012 +0100

    ...

commit 5a74bd347c65c09f4421a56c7443fc718dd7f12c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 13:47:08 2012 +0100

    reinserted EntityCreation component (commented out by stephan)

commit a0b046c34a626c7412d6c541c17bc31f8bd520e9
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Feb 14 10:05:36 2012 +0100

    made editor compile again, there exists a problem with the SVarSetter class, though

commit e57c6282be4808ec7e0f9bd1a85fc7cdad2f9e7a
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Dec 21 16:50:12 2011 +0100

    Quick fix (ComponentConfiguration)

commit d35abf010e2f9e2c8f409a1c7c408490b4845382
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 23:18:14 2011 +0100

    .

commit 885c9ab441cf1b0bf9de07c19ae69afc42bd396b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 22:06:34 2011 +0100

    fixed-paths

commit 0b0ec50fe944b34c5a21ac3aaa0fe05b0379ae2c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 21:59:02 2011 +0100

    ...

commit 768c2016adab90be7a6b5d1050c31ab66baa56c6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 21:47:25 2011 +0100

    sbt 0.11.1 now

commit 1678fbc5c8ac1d908bf79fddb956d375facfe5dc
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Nov 14 17:43:56 2011 +0100

    Test commit for submodule

commit d343b673fc8e929ddb22abdc8ae92b5e1fd9d2a4
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Nov 12 10:05:59 2011 +0100

    .

commit f489d5e900fdf93e7b41220f1ed8ec54220e4601
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Nov 12 09:30:52 2011 +0100

    .

commit 8ffe78169589c9cd8e45ef8fb279348d39141d69
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 15:22:04 2011 +0100

    ...

commit 0f085c6ef0f0158c4670050d48b7a1baa78ca0b2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 15:08:01 2011 +0100

    .

commit 4aba784cfffd46b25322dd588dd65e0d6813db7e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 14:54:36 2011 +0100

    added app configs

commit 4c2ae07647225b635723c19292d8363934373b4e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 14:44:18 2011 +0100

    added app configs

commit 3dc333ae7ce6f4746a6bf3c1af7ae531b88bf7cc
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 12:08:19 2011 +0100

    .

commit 0a154867d0c6a9dd86076b8aa2f1c4da171d0d0a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 12:01:19 2011 +0100

    more settings

commit ef96ab1d854a15980dcf1eb745fa4bc78b66b86b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 11:32:14 2011 +0100

    more settings

commit 2686143b80bab931d0376af76ca0612cb1638159
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 11:23:14 2011 +0100

    more settings

commit ebda8a5bc60d68f6e36949b171562be35ce979c5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 10:29:04 2011 +0100

    more settings

commit 98066b3181d9f8b4c55146837feb7487e5f4f503
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 09:44:44 2011 +0100

    .
Merge remote-tracking branch 'origin/master' into github-release

Conflicts:
	build.sbt
	editor-settings/config.xml
	editor.iml
	ivy.xml
	src/simx/components/editor/Editor.scala
	src/simx/components/editor/EditorConfiguration.scala
	src/simx/components/editor/MessagesAndEvents.scala
	src/simx/components/editor/filesystem/DynamicReloader.scala
	src/simx/components/editor/filesystem/SimXProperties.scala
	src/simx/components/editor/gui/EditorPanel.scala
	src/simx/components/editor/gui/SVarSetter.scala
	src/simx/components/editor/gui/SVarSetterPanel.scala
	src/simx/components/editor/gui/SVarViewPanel.scala
	src/simx/components/editor/gui/TreeNode.scala
	src/simx/components/editor/gui/TreeNodeVisualisations.scala