Branislav Stojkovic 08882a5167 Merge branch 'master' of ...

https://github.com/bancika/diy-layout-creator.git

Conflicts:
	diylc/diylc-library/lib/diylc-core.jar
	diylc/diylc-swing/lib/diylc-core.jar

2017-05-06 12:19:42 +02:00

..

app-framework.jar

moved log location

2017-04-25 12:37:25 +02:00

diylc-core.jar

Merge branch 'master' of

2017-05-06 12:19:42 +02:00

log4j-1.2.15.jar

move folders

2016-10-23 17:29:23 +02:00

xstream-1.4.3.jar

move folders

2016-10-23 17:29:23 +02:00