projects / mkjsf-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 753638f 4a136b8)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Mon, 13 May 2013 15:59:47 +0000 (11:59 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Mon, 13 May 2013 15:59:47 +0000 (11:59 -0400)
Conflicts:
src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java


Trivial merge
Utilities for creating Pazpar2 applications using JavaServer Faces and Ajax