Merge branch 'master' of github.com:wet-boew/wet-boew

Conflicts: build/grids/css/util-ie-min.css build/grids/css/util-min.css
wet-boew · Sep 11, 2012 · 35714af · 35714af
2 parents 418af41 + c0ece6a
commit 35714af
Show file tree

Hide file tree

Showing 100 changed files with 256 additions and 460 deletions.
diff --git a/build/js/bin/multimedia.swf b/build/js/bin/multimedia.swf
diff --git a/build/js/css/pe-ap-ie-min.css b/build/js/css/pe-ap-ie-min.css
diff --git a/build/js/css/pe-ap-min.css b/build/js/css/pe-ap-min.css
diff --git a/build/js/dependencies/calendar-min.js b/build/js/dependencies/calendar-min.js
diff --git a/build/js/i18n/fr-min.js b/build/js/i18n/fr-min.js
diff --git a/build/js/images/calendar/n.gif b/build/js/images/calendar/n.gif
diff --git a/build/js/images/calendar/n.png b/build/js/images/calendar/n.png
diff --git a/build/js/images/calendar/p.gif b/build/js/images/calendar/p.gif
diff --git a/build/js/images/calendar/p.png b/build/js/images/calendar/p.png
diff --git a/build/js/images/multimedia/loading.png b/build/js/images/multimedia/loading.png
diff --git a/build/js/pe-ap-min.js b/build/js/pe-ap-min.js
diff --git a/build/js/settings.js b/build/js/settings.js
@@ -7,7 +7,7 @@ WET-BOEW-Settings
  */
 var wet_boew_properties = {
 	/** global plugins are called via a array of dependency names **/
-	globals : ['equalize', 'deselectradio', 'css3ie'/*, 'toolbar'*/]
+	globals : ['equalize', 'deselectradio', 'css3ie']
 };
 
 /*

diff --git a/build/theme-gcwu-fegc/css/theme-ie-min.css b/build/theme-gcwu-fegc/css/theme-ie-min.css