Commit Graph

3 Commits

Author SHA1 Message Date
vanhofen
37a857d278 yWeb: integrate content of Y_NI_Blocks.txt into Y_Blocks.txt
Origin commit data
------------------
Commit: dda3b21917
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-09-09 (Fri, 09 Sep 2022)

Origin message was:
------------------
- yWeb: integrate content of Y_NI_Blocks.txt into Y_Blocks.txt
2022-09-09 22:43:15 +02:00
vanhofen
6bf8b04980 yWeb: integrate NI-yWeb into existing structure
Origin commit data
------------------
Commit: 5a037e906b
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-09-06 (Tue, 06 Sep 2022)

Origin message was:
------------------
- yWeb: integrate NI-yWeb into existing structure
2022-09-06 23:53:53 +02:00
vanhofen
5c391a82b8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 14:12:33 +01:00