• last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

    • -0
    • +10337
    ./bootstrapck/sample/js/jquery-1.11.0.js
  1. … 7833 more files in changeset.
file jquery-1.11.0.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./bootstrapck/sample/js/jquery-1.11.0.js
Merging back to HEAD all changes that happened in branch oacs-5-8 between tags: vg-merge-oacs-5-8-from-20141027 and vg-merge-oacs-5-8-from-20150427

  1. … 506 more files in changeset.
file locations.json was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/dev/locations.json
file icons32.svg was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/dev/icons32.svg
file skin.js was initially added on branch oacs-5-8.

file icons16.svg was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/dev/icons16.svg
file dialog.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/dialog/dialog.scss
file _config.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/config/_config.scss
file _defaults.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/config/_defaults.scss
file _toolbar.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_toolbar.scss
file _colors.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/config/_colors.scss
file editor.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/editor.scss
file _panel.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_panel.scss
file _richcombo.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_richcombo.scss
file _reset.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_reset.scss
file _presets.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_presets.scss
file _colorpanel.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_colorpanel.scss
file _menu.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_menu.scss
file _mainui.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_mainui.scss
file _elementspath.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/scss/components/_elementspath.scss
file dialog_iequirks.scss was initially added on branch oacs-5-8.

file dialog_opera.scss was initially added on branch oacs-5-8.

file editor_iequirks.scss was initially added on branch oacs-5-8.

file dialog_ie7.scss was initially added on branch oacs-5-8.

file editor_ie8.scss was initially added on branch oacs-5-8.

file dialog_ie8.scss was initially added on branch oacs-5-8.

file editor_ie7.scss was initially added on branch oacs-5-8.

file jquery-1.11.0.min.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck/sample/js/jquery-1.11.0.min.js
file editor_gecko.scss was initially added on branch oacs-5-8.