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:
295e4fa
673c4ff
)
Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle
author
Dan Poltawski
<dan@moodle.com>
Thu, 24 Oct 2013 02:19:47 +0000
(10:19 +0800)
committer
Dan Poltawski
<dan@moodle.com>
Thu, 24 Oct 2013 02:19:47 +0000
(10:19 +0800)
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
596582f
,
7a531d5
..
e5d01da
Binary files differ
diff --cc
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
index
7fa25ef
,
c702e87
..
57cfd6d
Binary files differ
diff --cc
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index
596582f
,
7a531d5
..
e5d01da
Binary files differ
diff --cc
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Simple merge
