Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

ipaaca
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

c542555a

Commit c542555a authored 12 years ago by Herwin van Welbergen

Downloads
- Plain Diff

Merge branch 'master' of ../../git_bare/ipaaca

Conflicts:
	ipaacalib/python/test/src/testnotifier.py

parents 81724039 7656d4c6

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

ipaacalib/java/src/ipaaca/OutputBuffer.java 4 additions, 1 deletion

ipaacalib/java/src/ipaaca/OutputBuffer.java
ipaacalib/java/test/src/ipaaca/ComponentMessageCommunicationIntegrationTest.java 64 additions, 42 deletions

.../ipaaca/ComponentMessageCommunicationIntegrationTest.java
ipaacalib/python/ivy.xml 2 additions, 2 deletions

ipaacalib/python/ivy.xml
ipaacalib/python/test/ivy.xml 2 additions, 2 deletions

ipaacalib/python/test/ivy.xml

with 72 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment