commit 27437742c4c1302602db9ca6a319519c24f11d1e
author Anand Doshi <anand@iwebnotes.com> Mon May 28 19:06:34 2012 +0530
committer Anand Doshi <anand@iwebnotes.com> Mon May 28 19:06:34 2012 +0530
tree 054f3f2a5163d91f768a45c3845d748f3375f20c
parent e012f064520dc65559659aff676bf1eff36919e5
parent 3237d6af6fcc8842e19832c4b8de815a624ca722

Merge branch 'master' of github.com:webnotes/erpnext

public/css/all-app.css

diff --git a/public/css/all-app.css b/public/css/all-app.css
index 34d5d72..4f5d548 100644
--- a/public/css/all-app.css
+++ b/public/css/all-app.css
@@ -3335,6 +3335,13 @@
   src: local('Cookie-Regular'), url('fonts/cookie.woff') format('woff');
 }
 
+@font-face {
+  font-family: 'Marck Script';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Marck Script'), local('MarckScript-Regular'), url('fonts/marckscript.woff') format('woff');
+}
+
 
 /*
  *	lib/js/lib/Aristo/aristo.selected.css

public/css/all-web.css

diff --git a/public/css/all-web.css b/public/css/all-web.css
index b134e43..1848143 100644
--- a/public/css/all-web.css
+++ b/public/css/all-web.css
@@ -2330,6 +2330,13 @@
   src: local('Cookie-Regular'), url('fonts/cookie.woff') format('woff');
 }
 
+@font-face {
+  font-family: 'Marck Script';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Marck Script'), local('MarckScript-Regular'), url('fonts/marckscript.woff') format('woff');
+}
+
 
 /*
  *	lib/css/ui/list.css

public/css/fonts/marckscript.woff

diff --git a/public/css/fonts/marckscript.woff b/public/css/fonts/marckscript.woff
new file mode 100644
index 0000000..e5f1f0b
--- /dev/null
+++ b/public/css/fonts/marckscript.woff
Binary files differ