Author: rjollos
Date: Fri Mar 15 08:50:42 2013
New Revision: 1456808
URL: http://svn.apache.org/r1456808
Log:
Merged r1456806 from trunk.
Modified:
incubator/bloodhound/branches/0.5/ (props changed)
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_language.html
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_timeline.html
incubator/bloodhound/branches/0.5/trac/ (props changed)
Propchange: incubator/bloodhound/branches/0.5/
------------------------------------------------------------------------------
Merged /incubator/bloodhound/trunk:r1456806
Modified:
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_language.html
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_language.html?rev=1456808&r1=1456807&r2=1456808&view=diff
==============================================================================
---
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_language.html
(original)
+++
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_language.html
Fri Mar 15 08:50:42 2013
@@ -1,3 +1,22 @@
+<!--!
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
Modified:
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html?rev=1456808&r1=1456807&r2=1456808&view=diff
==============================================================================
---
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html
(original)
+++
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html
Fri Mar 15 08:50:42 2013
@@ -1,3 +1,22 @@
+<!--!
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
Modified:
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_timeline.html
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_timeline.html?rev=1456808&r1=1456807&r2=1456808&view=diff
==============================================================================
---
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_timeline.html
(original)
+++
incubator/bloodhound/branches/0.5/bloodhound_theme/bhtheme/templates/bh_timeline.html
Fri Mar 15 08:50:42 2013
@@ -1,3 +1,22 @@
+<!--!
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
Propchange: incubator/bloodhound/branches/0.5/trac/
------------------------------------------------------------------------------
Merged /incubator/bloodhound/trunk/trac:r1456806
