jens db41fb525f Merge branch 'development' of ...

https://git.server47.de/jens/ShoppingList.git into development

Conflicts:
	ShoppingList/src/com/jens/rhasspy/shoppinglist/ShoppingListEntry.java
	ShoppingList/src/com/jens/rhasspy/shoppinglist/Start.java

2021-04-29 15:51:45 +02:00

..

lib

Initial commit

2021-02-03 22:49:24 +01:00

src/com/jens/rhasspy/shoppinglist

Merge branch 'development' of

2021-04-29 15:51:45 +02:00

.classpath

# WARNING: head commit changed in the meantime

2021-02-06 02:31:07 +01:00

.gitignore

Initial commit

2021-02-03 22:49:24 +01:00

.project

Initial commit

2021-02-03 22:49:24 +01:00

database-schema.sql

Included SQL schema

2021-02-03 22:59:14 +01:00

ShoppingList-settings.ini.example

Included example settings file.

2021-02-03 22:58:02 +01:00

ShoppingList.jar

Included compiled jar-version

2021-02-03 22:54:06 +01:00