Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wet-boew/wet-boew into feature-mu…
Browse files Browse the repository at this point in the history
…ltimedia-player

Conflicts:
	build/js/css/pe-ap-ie-min.css
	build/js/css/pe-ap-min.css
	build/js/pe-ap-min.js
  • Loading branch information
LaurentGoderre committed Aug 15, 2012
2 parents 0f7ed59 + e593718 commit 22a1785
Show file tree
Hide file tree
Showing 17 changed files with 655 additions and 558 deletions.
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.

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

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions demos/index-eng.html
Expand Up @@ -318,6 +318,7 @@ <h1 id="wb-cont">Working examples</h1>
<ul>
<li><a href="zebra/columnhightlight.html"><span class="wb-invisible">Zebra striping - </span>Column highlight table</a></li>
<li><a href="zebra/simple.html"><span class="wb-invisible">Zebra striping - </span>Simple table</a></li>
<li><a href="zebra/simplegrouping.html"><span class="wb-invisible">Zebra striping - </span>Simple grouping table</a></li>
<li><a href="zebra/invoice.html"><span class="wb-invisible">Zebra striping - </span>Invoice table</a></li>
<li><a href="zebra/collevel.html"><span class="wb-invisible">Zebra striping - </span>Col and row level with summary table</a></li>
<li><a href="zebra/longtable.html"><span class="wb-invisible">Zebra striping - </span>Long table</a></li>
Expand Down
1 change: 1 addition & 0 deletions demos/index-fra.html
Expand Up @@ -247,6 +247,7 @@ <h1 id="wb-cont">Exemples pratiques</h1>
<ul>
<li><a href="zebra/columnhightlight.html"><span class="wb-invisible">Rayage du zèbre - </span><span lang="en">Column highlight table</span></a></li>
<li><a href="zebra/simple.html"><span class="wb-invisible">Rayage du zèbre - </span><span lang="en">Simple table</span></a></li>
<li><a href="zebra/simplegrouping.html"><span class="wb-invisible">Zebra striping - </span><span lang="en">Simple grouping table</span></a></li>
<li><a href="zebra/invoice.html"><span class="wb-invisible">Rayage du zèbre - </span><span lang="en">Invoice table</span></a></li>
<li><a href="zebra/collevel.html"><span class="wb-invisible">Rayage du zèbre - </span><span lang="en">Col and row level with summary table</span></a></li>
<li><a href="zebra/longtable.html"><span class="wb-invisible">Rayage du zèbre - </span><span lang="en">Long table</span></a></li>
Expand Down

0 comments on commit 22a1785

Please sign in to comment.