Skip to content

Commit

Permalink
Merge remote-tracking branch 'wxt/master' into feature-chart-graph
Browse files Browse the repository at this point in the history
Conflicts:
	build/js/css/pe-ap-ie-min.css
	build/js/css/pe-ap-min.css
	build/js/dependencies/raphael-min.js
	build/js/i18n/en-min.js
	build/js/i18n/fr-min.js
	build/js/pe-ap-min.js
	build/theme-gcwu-fegc/css/theme-min.css
	build/theme-gcwu-fegc/css/theme-serv-min.css
	build/theme-gcwu-fegc/css/theme-sp-pe-min.css
	build/theme-gcwu-intranet/css/theme-min.css
	demos/charts/complex-eng.html
	demos/charts/simple-eng.html
	demos/charts/simpleCustomized-eng.html
	src/js/dependencies/raphael.js
	src/js/i18n/en.js
	src/js/i18n/fr.js
	src/js/sass/charts.scss
	src/js/workers/charts.js
	src/js/workers/parser.table.js
	src/js/workers/sel-cell.js
	src/js/workers/sel-col.js
	src/js/workers/sel-collevel.js
	src/js/workers/sel-data.js
	src/js/workers/sel-description.js
	src/js/workers/sel-keycell.js
	src/js/workers/sel-row.js
	src/js/workers/sel-rowlevel.js
	src/js/workers/sel-summary.js
	src/js/workers/sel-tblheader.js
  • Loading branch information
duboisp committed Aug 6, 2012
2 parents 02eb7cc + 3bf0b42 commit 272ddd2
Show file tree
Hide file tree
Showing 97 changed files with 3,791 additions and 5,886 deletions.
2 changes: 1 addition & 1 deletion build/grids/css/util-ie-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/grids/css/util-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/css/pe-ap-ie-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/css/pe-ap-min.css

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions build/js/dependencies/excanvas-min.js

This file was deleted.

6 changes: 0 additions & 6 deletions build/js/dependencies/flot-min.js

This file was deleted.

2 changes: 1 addition & 1 deletion build/js/pe-ap-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/theme-gcwu-fegc/css/theme-ie-min.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion build/theme-gcwu-fegc/css/theme-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/theme-gcwu-fegc/css/theme-serv-ie-min.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion build/theme-gcwu-fegc/css/theme-serv-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/theme-gcwu-fegc/css/theme-sp-pe-ie-min.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion build/theme-gcwu-fegc/css/theme-sp-pe-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/theme-gcwu-intranet/css/theme-ie-min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 272ddd2

Please sign in to comment.