T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						9f5caacc75
					 | 
					
						
						
							
							Updated the way colororder is configured per led
						
						
						
						
						
						
						
						Former-commit-id: 2a77b551c5b504f4ce9b0a179d4c20eaf6128f6b 
						
						
					 | 
					
						2015-02-23 16:11:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						b20f932ded
					 | 
					
						
						
							
							Merge branch 'master' into add_x11
						
						
						
						
						
						
						
						Former-commit-id: 4ce19c22a28609978e1eb72375d3aa7bf63a91be 
						
						
					 | 
					
						2014-04-30 22:34:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						e22c720e68
					 | 
					
						
						
							
							Add hyperion-usbasp led devices
						
						
						
						
						
						
						
						Remove all WS281x direct UART code (does not work reliable)
Former-commit-id: cd8103058d4ce0cd3280c7a2c5370397a14acf5c 
						
						
					 | 
					
						2014-03-09 11:36:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						5f457fd9e3
					 | 
					
						
						
							
							Added qt screenshot test
						
						
						
						
						
						
						
						Former-commit-id: c28e098ded780a6597952c83007fea1fe8da36fa 
						
						
					 | 
					
						2014-03-06 21:01:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						6b63b57f17
					 | 
					
						
						
							
							Added performance test for x11 grabbing
						
						
						
						
						
						
						
						Former-commit-id: b8c60cf9984c6961675b41002bed40d251bff9fa 
						
						
					 | 
					
						2014-02-25 22:09:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						f0c35071da
					 | 
					
						
						
							
							Move V4L2 grabber code to separate library
						
						
						
						
						
						
						
						Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc 
						
						
					 | 
					
						2014-02-07 21:11:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						b4c49c9ec4
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
						
						
						
						
						
						
						
						Former-commit-id: e21a530324abb6af92f4b34abdfbf23313775f4a 
						
						
					 | 
					
						2014-01-27 19:16:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						0047b0de56
					 | 
					
						
						
							
							Numerous mods for ws2812b to no avail.
						
						
						
						
						
						
						
						Former-commit-id: 1fda06d3df5e5394ff23277e1361ab1dc35c3205 
						
						
					 | 
					
						2014-01-27 19:15:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						f5317bc2d9
					 | 
					
						
						
							
							Moved black border detection code to seperate library
						
						
						
						
						
						
						
						Former-commit-id: 590029949b79689ea05409149677e51b748cb64f 
						
						
					 | 
					
						2014-01-26 14:23:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						6723c7bf2b
					 | 
					
						
						
							
							Moved test/v4l2_to_png to src/hyperion-v4l2; Added json backend temporarily
						
						
						
						
						
						
						
						Former-commit-id: 8c4e0ef7add8016c522d0b4c6f4df8886b905e36 
						
						
					 | 
					
						2014-01-25 17:35:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						1981f6e307
					 | 
					
						
						
							
							Merge branch 'master' into add_v4l
						
						
						
						
						
						
						
						Former-commit-id: 47ecb30270511ff7ce5acec48c4042dc1b13850c 
						
						
					 | 
					
						2014-01-24 20:09:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						a7110ec64c
					 | 
					
						
						
							
							Configurable blackborder threshold added
						
						
						
						
						
						
						
						Former-commit-id: 95b77dee2869b41bf556e0e374bea3c5e4534e61 
						
						
					 | 
					
						2014-01-20 20:46:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						d2665aebd4
					 | 
					
						
						
							
							Updated and addition of more tests for ws2812b control
						
						
						
						
						
						
						
						Former-commit-id: 57078dac71173b2cb203f644e4158e179161bf17 
						
						
					 | 
					
						2014-01-18 22:22:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						2cfbcc881b
					 | 
					
						
						
							
							Added cropping of the input picture
						
						
						
						
						
						
						
						Former-commit-id: 0dbb042c39dbdf841f6003391bf21f3f548433ee 
						
						
					 | 
					
						2014-01-12 20:27:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						f90f076ca4
					 | 
					
						
						
							
							Create an Hyperion image
						
						
						
						
						
						
						
						Former-commit-id: ea4c1a605f618b8581456c4db1ab015bcb46508b 
						
						
					 | 
					
						2014-01-12 20:04:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						c65cf872d1
					 | 
					
						
						
							
							renamed v4l2_to_png
						
						
						
						
						
						
						
						Former-commit-id: 87b89104673285a0a225fef53106f13c17bb22ac 
						
						
					 | 
					
						2014-01-12 19:54:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						545f2ee114
					 | 
					
						
						
							
							color decoding added; size decimation added
						
						
						
						
						
						
						
						Former-commit-id: ca3a959a4e842c86978855b005f97ce7a383a4fd 
						
						
					 | 
					
						2014-01-12 16:28:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						421ec6926f
					 | 
					
						
						
							
							Added framerate decimation
						
						
						
						
						
						
						
						Former-commit-id: 8f7eb09978aef5364cbab1f5dfe12afbf60e6cac 
						
						
					 | 
					
						2014-01-12 14:53:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						558ad6a11f
					 | 
					
						
						
							
							Added setting of PAL/NTSC/NO_CHANGE and input
						
						
						
						
						
						
						
						Former-commit-id: aee087b65b122e34e46b15854b94c720cbbec6b2 
						
						
					 | 
					
						2014-01-11 20:43:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						fdb140c1ae
					 | 
					
						
						
							
							Merge branch 'master' into add_v4l
						
						
						
						
						
						
						
						Former-commit-id: b3f1d532c6145ba80c161b18214de6efbc55ff7b 
						
						
					 | 
					
						2014-01-11 13:00:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						78209f3b92
					 | 
					
						
						
							
							Added test script for non inverted ws2812b
						
						
						
						
						
						
						
						Former-commit-id: 2de5308a8caedfd979c1afbeaca4934d0b578777 
						
						
					 | 
					
						2014-01-10 15:49:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						e474c90fcd
					 | 
					
						
						
							
							V4L2 test added
						
						
						
						
						
						
						
						Former-commit-id: eec49d94ffbb0e1be0639e9cbbebba5955c79f4d 
						
						
					 | 
					
						2014-01-05 14:42:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						9396583551
					 | 
					
						
						
							
							Added PiBlaster device
						
						
						
						
						
						
						
						Former-commit-id: d8559d17a5c1496aa5274da2b56a3e7b45a6d1f9 
						
						
					 | 
					
						2014-01-04 10:35:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						9be0aa9715
					 | 
					
						
						
							
							Modified the ws2812b to use a 3bit encoding speed which allows operation of the uart at slower speed.
						
						
						
						
						
						
						
						Former-commit-id: fb89050546f85f82fb1fcc4cc2d24f95d8f78de5 
						
						
					 | 
					
						2013-12-29 19:22:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						fd835b5bfb
					 | 
					
						
						
							
							Merge branch 'master' into macos_compile
						
						
						
						
						
						
						
						Conflicts:
	libsrc/leddevice/CMakeLists.txt
	libsrc/leddevice/LedDeviceFactory.cpp
	test/TestRs232HighSpeed.cpp
Former-commit-id: 5583f2f881afd1a9b0c8ec3a52d7d3b54fe1dff7 
						
						
					 | 
					
						2013-12-28 08:55:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						47d3f475ed
					 | 
					
						
						
							
							Removed bug in Hyperion.cpp and warning in TestRs232HighSpeed.cpp
						
						
						
						
						
						
						
						Former-commit-id: 63e992a3590db5a4e2c8d121b08291588f347ac7 
						
						
					 | 
					
						2013-12-28 08:41:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						71b8fd4879
					 | 
					
						
						
							
							Modification and additions to test working of ws2812b
						
						
						
						
						
						
						
						Former-commit-id: 2a7eb3cb67c85a4a4042bd0f1a6ea4d58792b1c2 
						
						
					 | 
					
						2013-12-28 07:34:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						4a494e53e9
					 | 
					
						
						
							
							Added small programming to compute ws2811 timing
						
						
						
						
						
						
						
						Former-commit-id: 3f62bca1476b1cba17946c309482e595f68c1698 
						
						
					 | 
					
						2013-12-25 10:14:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						01b5dcdd5c
					 | 
					
						
						
							
							Added Ws2812b specific device
						
						
						
						
						
						
						
						Former-commit-id: 675c8f578de42d12e25162065c0d0381ad0e08f6 
						
						
					 | 
					
						2013-12-23 21:58:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						7f3fbae314
					 | 
					
						
						
							
							A test program that writes green/red/blue to ws2812b at 4MHz
						
						
						
						
						
						
						
						Former-commit-id: 2fa36165086f5bef99eaca387f6abeed8c4e683c 
						
						
					 | 
					
						2013-12-23 11:55:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						78795b9fa8
					 | 
					
						
						
							
							New XBMC checker functionality: 3D video detection (filename based) and screensaver detection
						
						
						
						
						
						
						
						Former-commit-id: ea95e4ecde3ab9378bdf9c4c60950713947bd0ac 
						
						
					 | 
					
						2013-12-21 14:32:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						b63fdb0333
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin' into macos_compile
						
						
						
						
						
						
						
						Conflicts:
	test/CMakeLists.txt
Former-commit-id: b91fa41ebbd5ec96f6a98dddc49f86b4b8af15d8 
						
						
					 | 
					
						2013-12-20 20:02:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						eb4170c316
					 | 
					
						
						
							
							Create test program for creating screenshot with Qt
						
						
						
						
						
						
						
						Former-commit-id: 7e665ef0cd63f66c34ba2b441cafe34689358f3a 
						
						
					 | 
					
						2013-12-20 19:46:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johan
							
						 
					 | 
					
						
						
							
						
						e1a60e6944
					 | 
					
						
						
							
							Added test program for Rs232 device
						
						
						
						
						
						
						
						Former-commit-id: 0d546241456c57117bc6c8535635a938f2ec81fa 
						
						
					 | 
					
						2013-12-20 13:21:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Timo van der Zwan
							
						 
					 | 
					
						
						
							
						
						6f15e89d29
					 | 
					
						
						
							
							Implemented compile capability for MacOS.
						
						
						
						
						
						
						
						Former-commit-id: 86e560e0d4f03251ee08a648ffa6fd9a0e01ae78 
						
						
					 | 
					
						2013-12-17 22:53:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						b63753f5dc
					 | 
					
						
						
							
							Moved all devices to separate library and added 'Factory' for device creation.
						
						
						
						
						
						
						
						Former-commit-id: 26cab1b85b00406240689ad9c1018f0307028fe4 
						
						
					 | 
					
						2013-12-17 18:50:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						3634082b27
					 | 
					
						
						
							
							Update in tests
						
						
						
						
						
						
						
						Former-commit-id: 47ff5dd94a47e26da49eca0dc8ad9a23d38bc985 
						
						
					 | 
					
						2013-12-16 09:04:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						f65f546c61
					 | 
					
						
						
							
							Merge branch 'multi_colortransform'
						
						
						
						
						
						
						
						Conflicts:
	CMakeLists.txt
	config/hyperion.config.json
Former-commit-id: 43d42e4fed479f60333b35bc092f9a55cd2ad8e8 
						
						
					 | 
					
						2013-12-05 15:58:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						f1e28b3850
					 | 
					
						
						
							
							Fixed the grabber to produce a limited number of flag based png-files with unique names,
						
						
						
						
						
						
						
						Former-commit-id: dd37349042efa4642761b63d9e57ae39986a8386 
						
						
					 | 
					
						2013-12-05 12:57:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						369d5ee658
					 | 
					
						
						
							
							Added grab count and flags to filename
						
						
						
						
						
						
						
						Former-commit-id: 7abd1934b380cafcb93f861d715bc3981c1132de 
						
						
					 | 
					
						2013-12-04 16:48:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						e43778b08b
					 | 
					
						
						
							
							Added small test to parse some parts of the json file
						
						
						
						
						
						
						
						Former-commit-id: 2ecdb7d12289d63a5fde051262162d01d768c328 
						
						
					 | 
					
						2013-11-22 10:44:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						d78cbe55d6
					 | 
					
						
						
							
							Fixed BlackBorder test after changes to blackborder detector
						
						
						
						
						
						
						
						Former-commit-id: fc09afcbe23227cd44a72c23ddd0c4ee484b7478 
						
						
					 | 
					
						2013-11-20 09:06:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						b967f51f38
					 | 
					
						
						
							
							Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git into multi_colortransform
						
						
						
						
						
						
						
						Former-commit-id: fb4ab6331b5428bd34f5cc7ac7eba3fade5ef7dc 
						
						
					 | 
					
						2013-11-20 08:26:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						d60cca9e20
					 | 
					
						
						
							
							Added flag to disable dispmanx from build
						
						
						
						
						
						
						
						Former-commit-id: 6630f588a739a08601c0db79abd2cdf0b1c1839c 
						
						
					 | 
					
						2013-11-19 23:02:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						c8ce23e652
					 | 
					
						
						
							
							Renamed ColorTransform to RgbChannelTransform
						
						
						
						
						
						
						
						Former-commit-id: 390b832ba2d463710d4a063692f00b83a8c6c8ad 
						
						
					 | 
					
						2013-11-19 20:17:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						14a1adb9e0
					 | 
					
						
						
							
							Fixed dispmanx2png (incorrect color byte order)
						
						
						
						
						
						
						
						Former-commit-id: fe2529ba068e690e19797b3bd7ae10a2243c7286 
						
						
					 | 
					
						2013-11-14 08:52:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						d0429387ee
					 | 
					
						
						
							
							Updated dispmanx2png with commandline parameters for the flags.
						
						
						
						
						
						
						
						Former-commit-id: 80534875d36162a72c4b5dfd443350ad2e65df6e 
						
						
					 | 
					
						2013-11-13 19:23:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						dd16af0df5
					 | 
					
						
						
							
							Changed RgbImage to template based Image (with template for pixel type)
						
						
						
						
						
						
						
						Former-commit-id: ef02f164eaf3c2f9dd552c1c17b525cf6eed499c 
						
						
					 | 
					
						2013-11-11 09:00:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								T. van der Zwan
							
						 
					 | 
					
						
						
							
						
						c787241747
					 | 
					
						
						
							
							Moved all device to seperate directory
						
						
						
						
						
						
						
						Added 'sedu' device based on RS232 device
Former-commit-id: 918cbde65a4a14f532c2e08e104745715c3fdd37 
						
						
					 | 
					
						2013-11-05 16:18:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								johan
							
						 
					 | 
					
						
						
							
						
						a3e59f0243
					 | 
					
						
						
							
							Rewrite of black border detector to fix problems with overscan and xbmc video calibration settings
						
						
						
						
						
						
						
						Former-commit-id: ed6dd4e6872ea69d682096a82e108a3f7e7ca4ae 
						
						
					 | 
					
						2013-10-27 09:25:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |