| commit | 269f455f55691e5d6ee5b63c19098dbee995acbf | [log] [tgz] |
|---|---|---|
| author | Felix Meschberger <fmeschbe@apache.org> | Tue Jan 15 12:23:24 2008 +0000 |
| committer | Felix Meschberger <fmeschbe@apache.org> | Tue Jan 15 12:23:24 2008 +0000 |
| tree | b751ad7893c4283b31a4cf50864272fe6ca85db5 | |
| parent | 2e896c5e1dcd1a022bae01fe83337b464ddc5591 [diff] |
Add merge-first to prevent a warning while building the bundle git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@612092 13f79535-47bb-0310-9956-ffa450edef68