Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d2baaa
d40ce26
)
Merge branch 'MDL-42031-master' of git://github.com/mouneyrac/moodle
author
Marina Glancy
<marina@moodle.com>
Wed, 6 Nov 2013 06:18:38 +0000
(17:18 +1100)
committer
Marina Glancy
<marina@moodle.com>
Wed, 6 Nov 2013 06:18:38 +0000
(17:18 +1100)
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
1
2
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
patch
|
diff1
|
diff2
|
blob
|
history
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
patch
|
diff1
|
diff2
|
blob
|
history
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index
74c88d0
,
6babd9b
..
1cafbfe
Binary files differ
diff --cc
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
index
95bab08
,
b075022
..
428b46b
Binary files differ
diff --cc
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index
74c88d0
,
6babd9b
..
1cafbfe
Binary files differ
diff --cc
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Simple merge
