aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure/rhino1_7R1/src/manifest
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-03-22 00:16:53 +0100
committerEgil Moeller <egil.moller@freecode.no>2010-03-22 00:16:53 +0100
commitfc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7 (patch)
tree928419d6bfe794865e4b8f0634bd792f795c4b8a /infrastructure/rhino1_7R1/src/manifest
parent0fdab3db005c4fa31fb8306b573c0b35073d3e56 (diff)
parentd56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (diff)
downloadetherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.gz
etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.xz
etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.zip
Merge branch 'master' into plugin-framework
Diffstat (limited to '')
-rw-r--r--infrastructure/rhino1_7R1/src/manifest (renamed from trunk/infrastructure/rhino1_7R1/src/manifest)0
1 files changed, 0 insertions, 0 deletions
diff --git a/trunk/infrastructure/rhino1_7R1/src/manifest b/infrastructure/rhino1_7R1/src/manifest
index b7d0c06..b7d0c06 100644
--- a/trunk/infrastructure/rhino1_7R1/src/manifest
+++ b/infrastructure/rhino1_7R1/src/manifest