Merge branch 'feature/upstream' into develop

1 files changed, 10 insertions, 5 deletions

diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index 0d6d3ce..6decca0 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.36.6, the Vala compiler
+/* Camera.c generated by valac 0.40.4, the Vala compiler
  * generated from Camera.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -19,17 +20,21 @@ void camera_terminate (void);
 void camera_branch_terminate (void);
 
 
-void camera_init (GError** error) {
+void
+camera_init (GError** error)
+{
 #line 10 "/home/jens/Source/shotwell/src/camera/Camera.vala"
 	camera_branch_init ();
-#line 26 "Camera.c"
+#line 29 "Camera.c"
 }
 
 
-void camera_terminate (void) {
+void
+camera_terminate (void)
+{
 #line 14 "/home/jens/Source/shotwell/src/camera/Camera.vala"
 	camera_branch_terminate ();
-#line 33 "Camera.c"
+#line 38 "Camera.c"
 }