projects
/
juser-login-lib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d47ec4
969b069
)
Merge branch 'master' of file:///E:/Java%19Project/juser-lib
author
Roland Haeder
<roland@mxchange.org>
Wed, 7 Oct 2015 06:23:28 +0000
(08:23 +0200)
committer
Roland Haeder
<roland@mxchange.org>
Wed, 7 Oct 2015 06:23:28 +0000
(08:23 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
lib/juser-core.jar
src/org/mxchange/jusercore/model/user/UserSessionBeanRemote.java
1
2
src/org/mxchange/jusercore/model/user/UserSessionBeanRemote.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/org/mxchange/jusercore/model/user/UserSessionBeanRemote.java
Simple merge