| commit | 5ded62e5e1013bf8a142e02e00956cea5a0213ae | [log] [tgz] |
|---|---|---|
| author | Bob Brodt <bbrodt@redhat.com> | Tue Dec 18 15:54:13 2012 -0700 |
| committer | Bob Brodt <bbrodt@redhat.com> | Tue Dec 18 15:54:13 2012 -0700 |
| tree | ae580a10f3917d91b96f1b8ac9fc885a558b6eed | |
| parent | cf85804cd634beb5a1d1899293b95f3300455303 [diff] | |
| parent | 3656c02a796cd4829c84e3e463b077376fe715fe [diff] |
Merge branch 'develop' of ssh://git.eclipse.org:29418/bpel/org.eclipse.bpel into develop Conflicts: .gitignore
diff --git a/.gitignore b/.gitignore index d578ae1..5b0a486 100644 --- a/.gitignore +++ b/.gitignore
@@ -16,6 +16,7 @@ # additional stuff .metadata/ bin/ +.settings/ *.swp *~