Merge remote branch 'origin/master' into dexela

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/uca-camera.c

1 files changed, 28 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 4f3c174..7a91e80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+Changes in libuca 1.1
+=====================
+
+Plugin System
+-------------
+
+A new plugin manager is used to instantiate camera objects from a shared
+library. Instead of calling `uca_camera_new`, a plugin manager is created that
+looks in pre- and user-defined directories for DSOs that match
+`libuca[A-Za-z].so` and used to instantiate:
+
+    UcaPluginManager *manager;
+    UcaCamera *camera;
+
+    manager = uca_plugin_manager_new ();
+    camera = uca_plugin_manager_get_camera (manager, "foo", &error);
+
+The plugin manager adds a dependency on GModule (pkg-config package
+`gmodule-2.0`) that is part of GLib.
+
+Minor changes
+-------------
+
+- It is now possible to generate GObject introspection meta data to bind libuca
+  to all languages that support GObject introspection.
+- Added uca_camera_stop_readout() to cleanup after using
+  uca_camera_start_readout().
+
 
 Changes in libuca 1.0 aka 0.6
 =============================
@@ -14,7 +42,6 @@ instead of trying to initialize each camera first and having the user decide
 what to use, the user must now determine the used camera at compile time or use
 the factory pattern to delegate this to run-time. 
 
-
 Tango Wrapper
 -------------