diff options
author | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
---|---|---|
committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
commit | fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7 (patch) | |
tree | 928419d6bfe794865e4b8f0634bd792f795c4b8a /infrastructure/com.etherpad | |
parent | 0fdab3db005c4fa31fb8306b573c0b35073d3e56 (diff) | |
parent | d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (diff) | |
download | etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.gz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.xz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.zip |
Merge branch 'master' into plugin-framework
Diffstat (limited to '')
-rw-r--r-- | infrastructure/com.etherpad.openofficeservice/importexport.scala (renamed from trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala) | 0 | ||||
-rw-r--r-- | infrastructure/com.etherpad/easysync2support.scala (renamed from trunk/infrastructure/com.etherpad/easysync2support.scala) | 0 | ||||
-rw-r--r-- | infrastructure/com.etherpad/licensing.scala (renamed from trunk/infrastructure/com.etherpad/licensing.scala) | 0 | ||||
-rw-r--r-- | infrastructure/com.etherpad/main.scala (renamed from trunk/infrastructure/com.etherpad/main.scala) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala b/infrastructure/com.etherpad.openofficeservice/importexport.scala index f5150ad..f5150ad 100644 --- a/trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala +++ b/infrastructure/com.etherpad.openofficeservice/importexport.scala diff --git a/trunk/infrastructure/com.etherpad/easysync2support.scala b/infrastructure/com.etherpad/easysync2support.scala index 9f1c527..9f1c527 100644 --- a/trunk/infrastructure/com.etherpad/easysync2support.scala +++ b/infrastructure/com.etherpad/easysync2support.scala diff --git a/trunk/infrastructure/com.etherpad/licensing.scala b/infrastructure/com.etherpad/licensing.scala index 9318f78..9318f78 100644 --- a/trunk/infrastructure/com.etherpad/licensing.scala +++ b/infrastructure/com.etherpad/licensing.scala diff --git a/trunk/infrastructure/com.etherpad/main.scala b/infrastructure/com.etherpad/main.scala index 5110aba..5110aba 100644 --- a/trunk/infrastructure/com.etherpad/main.scala +++ b/infrastructure/com.etherpad/main.scala |