2009-09-25 11:00:15 +08:00
|
|
|
# This file simply contains up-to-date merge information for this branch.
|
|
|
|
|
#
|
|
|
|
|
# All changes from trunk will be merged into this trunk during development.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Last update was:
|
|
|
|
|
# -r 2575:HEAD - Sep 22 13:43
|
|
|
|
|
|
|
|
|
|
# Command used
|
|
|
|
|
svn merge -r 2575:HEAD https://bigbluebutton.googlecode.com/svn/trunk/
|
2010-02-01 07:50:53 +08:00
|
|
|
|
|
|
|
|
test
|
|
|
|
|
test
|
|
|
|
|
test
|
|
|
|
|
test
|
