Permalink
Browse files

tidied LICENSE file and added link to license info to README.markdown

  • Loading branch information...
1 parent 055f55b commit 9745038fa042c2fe234814b6f4ed93e725f03e11 @chillitom chillitom committed Dec 8, 2010
Showing with 13 additions and 9 deletions.
  1. +10 −8 LICENSE
  2. +3 −1 README.markdown
View
@@ -1,19 +1,21 @@
-// Copyright (c) 2010 Tom Rathbone.
+// Copyright (c) 2010, Tom Rathbone.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
+// notice, this list of conditions and the following disclaimer.
+//
// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
// * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
+// Framework nor the name CefSharp nor the names of its contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
View
@@ -3,6 +3,8 @@ CefSharp - Embedded Chromium for .Net
This project contains .Net CLR bindings for The [Chromium Embedded Framework (CEF)](http://code.google.com/p/chromiumembedded/ "Google Code") by Marshall A. Greenblatt. The bindings are written in C++/CLI but can be used from any CLR language e.g. C# or VB. See the CefTest project for an example web browser built using this library.
+This project is [BSD](http://www.opensource.org/licenses/bsd-license.php "BSD License") licensed.
+
NEWS
====
@@ -11,7 +13,7 @@ NEWS
- [Download 0.1 here](https://github.com/downloads/chillitom/CefSharp/CefSharp-0.1.7z "src, bins and examples")
- BrowserControl user control
- Load, Forward, Back, Stop, Go
-- INotifyPropertyChanged notification for navigation events `CanGoForward`, `CanGoBack` etc.
+- INotifyPropertyChanged notification for navigation events CanGoForward, CanGoBack etc.
- ExecuteJavascript, works but needs polish
- Interception of resource loading, loads from System.IO.Stream

0 comments on commit 9745038

Please sign in to comment.