diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-21 23:33:06 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-21 23:33:06 +0100 |
| commit | d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (patch) | |
| tree | b1dfe31956f3fc86e3408f1efac5e12acf65b11a /infrastructure/lib | |
| parent | c1894c8e0a52f4e3d2f89fa92f0066bbf0fcf1b1 (diff) | |
| parent | 103d4926ae6c61824dc0b48be7bf66f08830ed47 (diff) | |
| download | etherpad-d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8.tar.gz etherpad-d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8.tar.xz etherpad-d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8.zip | |
Merge branch 'master' of git@github.com:ether/pad
Diffstat (limited to '')
| -rw-r--r-- | infrastructure/lib/activation.jar (renamed from trunk/infrastructure/lib/activation.jar) | bin | 56290 -> 56290 bytes | |||
| -rw-r--r-- | infrastructure/lib/c3p0-0.9.1.2.jar (renamed from trunk/infrastructure/lib/c3p0-0.9.1.2.jar) | bin | 610790 -> 610790 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-lang-2.4.jar (renamed from trunk/infrastructure/lib/commons-lang-2.4.jar) | bin | 261809 -> 261809 bytes | |||
| -rw-r--r-- | infrastructure/lib/derby-10.5.1.1.jar (renamed from trunk/infrastructure/lib/derby-10.5.1.1.jar) | bin | 2513361 -> 2513361 bytes | |||
| -rw-r--r-- | infrastructure/lib/derbytools.jar (renamed from trunk/infrastructure/lib/derbytools.jar) | bin | 155796 -> 155796 bytes | |||
| -rw-r--r-- | infrastructure/lib/dnsjava-2.0.6.jar (renamed from trunk/infrastructure/lib/dnsjava-2.0.6.jar) | bin | 268823 -> 268823 bytes | |||
| -rw-r--r-- | infrastructure/lib/jetty-6.1.20.jar (renamed from trunk/infrastructure/lib/jetty-6.1.20.jar) | bin | 533605 -> 533605 bytes | |||
| -rw-r--r-- | infrastructure/lib/jetty-sslengine-6.1.20.jar (renamed from trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar) | bin | 18285 -> 18285 bytes | |||
| -rw-r--r-- | infrastructure/lib/jetty-util-6.1.20.jar (renamed from trunk/infrastructure/lib/jetty-util-6.1.20.jar) | bin | 176016 -> 176016 bytes | |||
| -rw-r--r-- | infrastructure/lib/json.jar (renamed from trunk/infrastructure/lib/json.jar) | bin | 42335 -> 42335 bytes | |||
| -rw-r--r-- | infrastructure/lib/mail.jar (renamed from trunk/infrastructure/lib/mail.jar) | bin | 356519 -> 356519 bytes | |||
| -rw-r--r-- | infrastructure/lib/manifest (renamed from trunk/infrastructure/lib/manifest) | 0 | ||||
| -rw-r--r-- | infrastructure/lib/rhino-js-1.7r1.jar (renamed from trunk/infrastructure/lib/rhino-js-1.7r1.jar) | bin | 769000 -> 769000 bytes | |||
| -rw-r--r-- | infrastructure/lib/sanselan-0.94aj.jar (renamed from trunk/infrastructure/lib/sanselan-0.94aj.jar) | bin | 390426 -> 390426 bytes | |||
| -rw-r--r-- | infrastructure/lib/servlet-api-2.5-20081211.jar (renamed from trunk/infrastructure/lib/servlet-api-2.5-20081211.jar) | bin | 134190 -> 134190 bytes | |||
| -rw-r--r-- | infrastructure/lib/tagsoup-1.2.jar (renamed from trunk/infrastructure/lib/tagsoup-1.2.jar) | bin | 90023 -> 90023 bytes | |||
| -rw-r--r-- | infrastructure/lib/yuicompressor-2.4-appjet.jar (renamed from trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar) | bin | 574932 -> 574932 bytes |
17 files changed, 0 insertions, 0 deletions
diff --git a/trunk/infrastructure/lib/activation.jar b/infrastructure/lib/activation.jar Binary files differindex 29a59a9..29a59a9 100644 --- a/trunk/infrastructure/lib/activation.jar +++ b/infrastructure/lib/activation.jar diff --git a/trunk/infrastructure/lib/c3p0-0.9.1.2.jar b/infrastructure/lib/c3p0-0.9.1.2.jar Binary files differindex 0f42d60..0f42d60 100644 --- a/trunk/infrastructure/lib/c3p0-0.9.1.2.jar +++ b/infrastructure/lib/c3p0-0.9.1.2.jar diff --git a/trunk/infrastructure/lib/commons-lang-2.4.jar b/infrastructure/lib/commons-lang-2.4.jar Binary files differindex 532939e..532939e 100644 --- a/trunk/infrastructure/lib/commons-lang-2.4.jar +++ b/infrastructure/lib/commons-lang-2.4.jar diff --git a/trunk/infrastructure/lib/derby-10.5.1.1.jar b/infrastructure/lib/derby-10.5.1.1.jar Binary files differindex 2820dbd..2820dbd 100644 --- a/trunk/infrastructure/lib/derby-10.5.1.1.jar +++ b/infrastructure/lib/derby-10.5.1.1.jar diff --git a/trunk/infrastructure/lib/derbytools.jar b/infrastructure/lib/derbytools.jar Binary files differindex 4aa76e1..4aa76e1 100644 --- a/trunk/infrastructure/lib/derbytools.jar +++ b/infrastructure/lib/derbytools.jar diff --git a/trunk/infrastructure/lib/dnsjava-2.0.6.jar b/infrastructure/lib/dnsjava-2.0.6.jar Binary files differindex e41f9b0..e41f9b0 100644 --- a/trunk/infrastructure/lib/dnsjava-2.0.6.jar +++ b/infrastructure/lib/dnsjava-2.0.6.jar diff --git a/trunk/infrastructure/lib/jetty-6.1.20.jar b/infrastructure/lib/jetty-6.1.20.jar Binary files differindex 8f45db9..8f45db9 100644 --- a/trunk/infrastructure/lib/jetty-6.1.20.jar +++ b/infrastructure/lib/jetty-6.1.20.jar diff --git a/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar b/infrastructure/lib/jetty-sslengine-6.1.20.jar Binary files differindex 6f7d232..6f7d232 100644 --- a/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar +++ b/infrastructure/lib/jetty-sslengine-6.1.20.jar diff --git a/trunk/infrastructure/lib/jetty-util-6.1.20.jar b/infrastructure/lib/jetty-util-6.1.20.jar Binary files differindex 96c0979..96c0979 100644 --- a/trunk/infrastructure/lib/jetty-util-6.1.20.jar +++ b/infrastructure/lib/jetty-util-6.1.20.jar diff --git a/trunk/infrastructure/lib/json.jar b/infrastructure/lib/json.jar Binary files differindex 5ab955c..5ab955c 100644 --- a/trunk/infrastructure/lib/json.jar +++ b/infrastructure/lib/json.jar diff --git a/trunk/infrastructure/lib/mail.jar b/infrastructure/lib/mail.jar Binary files differindex e6f7083..e6f7083 100644 --- a/trunk/infrastructure/lib/mail.jar +++ b/infrastructure/lib/mail.jar diff --git a/trunk/infrastructure/lib/manifest b/infrastructure/lib/manifest index b91a5a7..b91a5a7 100644 --- a/trunk/infrastructure/lib/manifest +++ b/infrastructure/lib/manifest diff --git a/trunk/infrastructure/lib/rhino-js-1.7r1.jar b/infrastructure/lib/rhino-js-1.7r1.jar Binary files differindex 79f8529..79f8529 100644 --- a/trunk/infrastructure/lib/rhino-js-1.7r1.jar +++ b/infrastructure/lib/rhino-js-1.7r1.jar diff --git a/trunk/infrastructure/lib/sanselan-0.94aj.jar b/infrastructure/lib/sanselan-0.94aj.jar Binary files differindex 0fd8c96..0fd8c96 100644 --- a/trunk/infrastructure/lib/sanselan-0.94aj.jar +++ b/infrastructure/lib/sanselan-0.94aj.jar diff --git a/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar b/infrastructure/lib/servlet-api-2.5-20081211.jar Binary files differindex f1bfa12..f1bfa12 100644 --- a/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar +++ b/infrastructure/lib/servlet-api-2.5-20081211.jar diff --git a/trunk/infrastructure/lib/tagsoup-1.2.jar b/infrastructure/lib/tagsoup-1.2.jar Binary files differindex af27803..af27803 100644 --- a/trunk/infrastructure/lib/tagsoup-1.2.jar +++ b/infrastructure/lib/tagsoup-1.2.jar diff --git a/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar b/infrastructure/lib/yuicompressor-2.4-appjet.jar Binary files differindex b5bdfc1..b5bdfc1 100644 --- a/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar +++ b/infrastructure/lib/yuicompressor-2.4-appjet.jar |