b70c8423a2
- manual merge from master
13 lines
317 B
Diff
13 lines
317 B
Diff
diff -up nss/lib/ckfw/manifest.mn.libpem nss/lib/ckfw/manifest.mn
|
|
--- nss/lib/ckfw/manifest.mn.libpem 2013-05-28 14:43:24.000000000 -0700
|
|
+++ nss/lib/ckfw/manifest.mn 2013-05-30 22:14:49.247459672 -0700
|
|
@@ -5,7 +5,7 @@
|
|
|
|
CORE_DEPTH = ../..
|
|
|
|
-DIRS = builtins
|
|
+DIRS = builtins pem
|
|
|
|
PRIVATE_EXPORTS = \
|
|
ck.h \
|