Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.1 local #2

Open
wants to merge 71 commits into
base: 2.1
Choose a base branch
from
Open

2.1 local #2

wants to merge 71 commits into from

Conversation

gpgreen
Copy link

@gpgreen gpgreen commented May 20, 2015

Added source/target to maven compilation plugin. Added packaging type so jar can be installed in local maven by "mvn install".

Bradley J Clement and others added 30 commits January 3, 2014 07:35
Bradley J Clement and others added 29 commits August 4, 2014 08:05
LinkedHashMaps so that they need not be Comparable
https://[email protected]/mbee-dev/util.git

Conflicts:
	src/gov/nasa/jpl/mbee/util/Timer.java
Conflicts:
	build.xml
	src/gov/nasa/jpl/mbee/util/AbstractDiff.java
	src/gov/nasa/jpl/mbee/util/ClassUtils.java
	src/gov/nasa/jpl/mbee/util/Debug.java
	src/gov/nasa/jpl/mbee/util/HasId.java
	src/gov/nasa/jpl/mbee/util/Utils.java
@gpgreen
Copy link
Author

gpgreen commented May 20, 2015

Also merged with opensource branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants