diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2014-06-28 17:00:57 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2014-06-28 17:00:57 +0200 |
| commit | 3ad9c273d9fcc6e3a5b0019c3e3b01b7e6d47d67 (patch) | |
| tree | c79df93d0614de024dc56077790a4d2c31cbe2c8 /.gitignore | |
| parent | 29e8e2af39a3d6672692eba0e8f9b8966a047f96 (diff) | |
| parent | 315671e79d118de718ae53b664878dd168f70ca2 (diff) | |
| download | lombok-3ad9c273d9fcc6e3a5b0019c3e3b01b7e6d47d67.tar.gz lombok-3ad9c273d9fcc6e3a5b0019c3e3b01b7e6d47d67.tar.bz2 lombok-3ad9c273d9fcc6e3a5b0019c3e3b01b7e6d47d67.zip | |
Merge branch 'master' of github.com:rzwitserloot/lombok
Conflicts:
doc/changelog.markdown
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -6,7 +6,7 @@ /google.properties /debug /*.launch -/escudo-upload.key +/ssh.configuration /findbugsReport.html /lib /.settings @@ -18,3 +18,4 @@ *.markdown.html /junit*.properties /eclipse.location +/.apt_generated/ |