diff options
| author | Emil Ivov <emcho@jitsi.org> | 2014-07-10 13:26:30 +0200 |
|---|---|---|
| committer | Emil Ivov <emcho@jitsi.org> | 2014-07-10 13:26:30 +0200 |
| commit | 13322e0ca0d92a7077f0246a2f7c8299ff146cdb (patch) | |
| tree | 759d898c73c45ed0eb80272bb3dd6cbad5732e65 /.gitignore | |
| parent | 8cfed9f5c6d958e2775ebeebf10a9dfec55e8071 (diff) | |
| parent | 6c3318349bf7b2fc15b917d2b96505e04e23cc6b (diff) | |
| download | jitsi-13322e0ca0d92a7077f0246a2f7c8299ff146cdb.zip jitsi-13322e0ca0d92a7077f0246a2f7c8299ff146cdb.tar.gz jitsi-13322e0ca0d92a7077f0246a2f7c8299ff146cdb.tar.bz2 | |
Merge branch 'master' into webstart
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3,8 +3,9 @@ classes sc-bundles .gitignore.swp *.iws -.gitignore jitsi.iml +jitsi-local.iml +jitsi.ipr test-reports sip-communicator.utest.bin release |