]> git.mxchange.org Git - jbonuscard-lib.git/commit
Merge branch 'rewrites/jpa' of file:///E:/Java%19Project/addressbook into rewrites/jpa
authorRoland Haeder <roland@mxchange.org>
Fri, 25 Sep 2015 13:25:06 +0000 (15:25 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 25 Sep 2015 13:25:06 +0000 (15:25 +0200)
commit99e865bd60b4bf37442dd480620c3c55a7368fec
tree2a2ac4ee9fc572e43ac243be3e40842a8f74fae9
parentb26437d0c4be7464261ac4e4085e55ce80364387
parentec0792903b50a3bf7fea9c0a02ee800cd0a42560
Merge branch 'rewrites/jpa' of file:///E:/Java%19Project/addressbook into rewrites/jpa

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
lib/jcore.jar
lib/jswingcore.jar