Skip to content

Conversation

@nimbosa
Copy link
Member

@nimbosa nimbosa commented Oct 13, 2018

this is huge and requires manual merge + next commit for branding & renaming

vaklinov and others added 30 commits March 10, 2018 15:50
Conflicts resolved:
	src/build/build.xml
	src/java/com/vaklinov/zcashui/DashboardPanel.java
	src/java/com/vaklinov/zcashui/ZCashUI.java
	src/resources/ubuntu-package/control
Feature/i18n Translation to Italian and German
cronicc and others added 30 commits March 28, 2022 10:02
* Update to zend v3.3.1, swing version 1.0.10

* update jdk number

* revert jdk bump

* update jdk latest version

* revert

* update determine_latest_jdk function
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.21.0 to 3.41.2.2.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](xerial/sqlite-jdbc@3.21.0...3.41.2.2)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: TaiJon <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* test jdk version bump

* update ant ver

* update zend v4.1.0, swing version 1.0.12
* Update LICENSE

* Update copyright info
chore: update readme to archive the repo (#194)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

help wanted Extra attention is needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.