diff options
| author | jesus m. rodriguez <jesusr@redhat.com> | 2009-11-10 16:12:14 -0500 |
|---|---|---|
| committer | jesus m. rodriguez <jesusr@redhat.com> | 2009-11-10 16:12:14 -0500 |
| commit | c180c375652ac88d2fc84874aabf6b12b9c567f8 (patch) | |
| tree | 81d940b3bfb9299db2e8ce734b4039b7751c9563 | |
| parent | 2912b38188eb38303bb97be9c325cac261450e83 (diff) | |
| parent | 350fb9f0ef9756577161afcb16ee7b064f6309d3 (diff) | |
| download | candlepin-c180c375652ac88d2fc84874aabf6b12b9c567f8.tar.gz candlepin-c180c375652ac88d2fc84874aabf6b12b9c567f8.tar.xz candlepin-c180c375652ac88d2fc84874aabf6b12b9c567f8.zip | |
Merge branch 'master' into buildr
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,4 +22,5 @@ proxy/*.jar proxy/*.txt proxy/*.out proxy/target +proxy/reports *~ |