summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-10-23 08:20:06 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-10-23 08:20:06 +0000
commitd0facdd4d6bc35197b5e129788b81484d7c3e7e7 (patch)
tree063e2af4513eefbfa4d9e83f3025031f0899fb92
parent622197008a59aa2f3b1289bd7cdc440d3f84e3fb (diff)
downloadATCD-d0facdd4d6bc35197b5e129788b81484d7c3e7e7.tar.gz
Thu Oct 23 08:19:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/docs/svn/config1
-rw-r--r--ACE/docs/svn/svn-prefs.reg2
3 files changed, 9 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 80bff85828b..15bae13cfe0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 23 08:19:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * docs/svn/config:
+ * docs/svn/svn-prefs.reg:
+ Added conf/pem extensions
+
Thu Oct 23 08:06:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_other_tests.lst:
diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config
index 743e4ac9dea..1ecc4abce59 100644
--- a/ACE/docs/svn/config
+++ b/ACE/docs/svn/config
@@ -141,6 +141,7 @@ enable-auto-props = yes
*.ll=svn:eol-style=native;svn:keywords=Author Date Id Revision
*.yy=svn:eol-style=native;svn:keywords=Author Date Id Revision
*.conf=svn:eol-style=native;svn:keywords=Author Date Id Revision
+*.pem=svn:eol-style=native;svn:keywords=Author Date Id Revision
Change?og*=svn:eol-style=native;svn:keywords=Author Date Id Revision
README=svn:eol-style=native;svn:keywords=Author Date Id Revision
"Makefile"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
diff --git a/ACE/docs/svn/svn-prefs.reg b/ACE/docs/svn/svn-prefs.reg
index b4c15c2cdcc..b6214888a3c 100644
--- a/ACE/docs/svn/svn-prefs.reg
+++ b/ACE/docs/svn/svn-prefs.reg
@@ -35,6 +35,7 @@ REGEDIT4
[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auto-props]
"*.aspx"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
+"*.conf"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
"*.cpp"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
"*.cxx"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
"*.cc"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
@@ -52,6 +53,7 @@ REGEDIT4
"*.pidl"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
"*.cidl"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
"*.html"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
+"*.pem"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
"*.sh"="svn:eol-style=native;svn:keywords=Author Date Id Revision;svn:executable"
"*.py"="svn:eol-style=native;svn:keywords=Author Date Id Revision;svn:executable"
"*.pl"="svn:eol-style=native;svn:keywords=Author Date Id Revision;svn:executable"