diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-12-08 16:26:32 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-12-08 16:26:32 +0200 |
| commit | d4be34e7bf6a17db29acba8c12652b3117983554 (patch) | |
| tree | 764af2f47259a1d67c7732afa1c5d87015ca209b /.gitignore | |
| parent | 8aae0e9bb57bc737a5f7fcc6cf08fdde3aee2de5 (diff) | |
| parent | 8f95be653356e45692680d595bd96b77df3f949f (diff) | |
| download | vaadin-framework-d4be34e7bf6a17db29acba8c12652b3117983554.tar.gz vaadin-framework-d4be34e7bf6a17db29acba8c12652b3117983554.zip | |
Merge remote branch 'origin/master' into windowing
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 9f652e633f..71f41f939d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,5 @@ /build/test-output /build/integration-test-output -# /build/buildhelpers/com/vaadin/buildhelpers/ -/build/buildhelpers/com/vaadin/buildhelpers/*.class +# /bin/ /bin |