It looks good other than I don't think we really need .directory files, maybe add a new pattern to .gitignore?
4816 4817 === added file 'resources/images/.directory' 4818 --- resources/images/.directory 1970-01-01 00:00:00 +0000 4819 +++ resources/images/.directory 2014-01-14 19:58:54 +0000 4820 @@ -0,0 +1,4 @@ 4821 +[Dolphin] 4822 +PreviewsShown=true 4823 +Timestamp=2014,1,14,21,13,49 4824 +Version=3
« Back to merge proposal
It looks good other than I don't think we really need .directory files, maybe add a new pattern to .gitignore?
4816 images/ .directory' images/ .directory 1970-01-01 00:00:00 +0000 images/ .directory 2014-01-14 19:58:54 +0000 2014,1, 14,21,13, 49
4817 === added file 'resources/
4818 --- resources/
4819 +++ resources/
4820 @@ -0,0 +1,4 @@
4821 +[Dolphin]
4822 +PreviewsShown=true
4823 +Timestamp=
4824 +Version=3