You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openmeetings.apache.org by se...@apache.org on 2011/12/18 15:18:30 UTC

svn commit: r1220413 - /incubator/openmeetings/branches/video-components/

Author: sebawagner
Date: Sun Dec 18 14:18:29 2011
New Revision: 1220413

URL: http://svn.apache.org/viewvc?rev=1220413&view=rev
Log:
sync r4525 from branches

Added:
    incubator/openmeetings/branches/video-components/   (props changed)
      - copied from r1220094, incubator/openmeetings/import/trunk/singlewebapp/

Propchange: incubator/openmeetings/branches/video-components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Dec 18 14:18:29 2011
@@ -0,0 +1,7 @@
+bin
+build
+dist
+filetest.keystore
+screen_compile
+junitreport
+log

Propchange: incubator/openmeetings/branches/video-components/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Dec 18 14:18:29 2011
@@ -0,0 +1,2 @@
+/incubator/openmeetings/import/branches/dev/injection:1219598-1219722
+/incubator/openmeetings/import/branches/dev/om_openjpa:1219535-1219562