From: Joakim Verona <joakim@verona.se>
Date: Tue, 3 Feb 2015 23:00:13 +0000 (+0100)
Subject: merge master + move changelog and news to readme
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b52e2e5598aeb6dcc9bae5032ce4fa3da9bf40e9;p=emacs.git

merge master + move changelog and news to readme
---

b52e2e5598aeb6dcc9bae5032ce4fa3da9bf40e9
diff --cc README.xwidget
index cfde411082b,00000000000..b8ba6b872b3
mode 100644,000000..100644
--- a/README.xwidget
+++ b/README.xwidget
@@@ -1,2 -1,0 +1,14 @@@
 +-*-org-*-
 +Please see https://github.com/jave/xwidget-aux for documentation.
++
++* NEWS
++** Xwidgets : A new feature for embedding native widgets
++inside Emacs buffers. If you have gtk3 and webkit-devel installed,
++you can try the embedded webkit browser with m-x xwidget-webkit-browse-url.
++
++
++* lisp/Changelog
++
++2015-02-01  Joakim Verona  <joakim@verona.se>
++	Support for the new Xwidget feature.
++	* xwidget.el:
diff --cc test/ChangeLog
index 28178812a95,56e3ac08e54..60b3ed352d0
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,11 -1,7 +1,12 @@@
 +2015-02-01 Joakim Verona  <joakim@verona.se>
 +	Support for testing xwidgets
 +	* xwidget-test-manual.el:
 +
- 2015-02-01  Grégoire Jadi  <daimrod@gmail.com>
- 	Support for testing xwidgets
- 	* automated/xwidget-tests.el:
+ 2015-02-03  Artur Malabarba  <bruce.connor.am@gmail.com>
+ 
+ 	* automated/package-test.el (package-test-get-deps): New test.
+ 
 +
  2015-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
  
  	* automated/eieio-tests.el (eieio-test-23-inheritance-check): Simplify.