Viewing all changes in revision 30.
- Committer: Alexandre ACEBEDO
- Date: 2016-06-05 20:10:36 UTC
- mfrom: (1.6.17)
- Revision ID: git-v1:50f71b81e03e9e041fd206a1f55626404a5c1842
Remerging master on develop
Merge branch 'master' into develop
Merge branch 'master' into develop
- files added:
- .gitattributes
- environments
- environments/build
- resources/roles
- resources/roles/i3
- resources/roles/i3/files
- resources/roles/i3/files/autostart
- resources/roles/i3/files/xfce
- resources/roles/i3/tasks
- resources/roles/themes
- resources/roles/themes/files
- resources/roles/themes/files/autostart
- resources/roles/themes/files/compton
- resources/roles/themes/files/conky
- resources/roles/themes/files/fonts
- resources/roles/themes/files/i3
- resources/roles/themes/files/lightdm
- resources/roles/themes/files/xfce
- resources/roles/themes/tasks
- resources/roles/utilities
- resources/roles/utilities/files
- resources/roles/utilities/tasks
- resources/roles/zsh
- resources/roles/zsh/files
- resources/roles/zsh/files/zsh
- resources/roles/zsh/tasks
- files removed:
- debian
- debian/source
- resources/share
- resources/share/i3-xfce
- resources/share/i3-xfce/roles
- resources/share/i3-xfce/roles/i3
- resources/share/i3-xfce/roles/i3/files
- resources/share/i3-xfce/roles/i3/files/autostart
- resources/share/i3-xfce/roles/i3/files/xfce
- resources/share/i3-xfce/roles/i3/tasks
- resources/share/i3-xfce/roles/themes
- resources/share/i3-xfce/roles/themes/files
- resources/share/i3-xfce/roles/themes/files/autostart
- resources/share/i3-xfce/roles/themes/files/compton
- resources/share/i3-xfce/roles/themes/files/conky
- resources/share/i3-xfce/roles/themes/files/fonts
- resources/share/i3-xfce/roles/themes/files/i3
- resources/share/i3-xfce/roles/themes/files/lightdm
- resources/share/i3-xfce/roles/themes/files/xfce
- resources/share/i3-xfce/roles/themes/tasks
- resources/share/i3-xfce/roles/utilities
- resources/share/i3-xfce/roles/utilities/files
- resources/share/i3-xfce/roles/utilities/tasks
- resources/share/i3-xfce/roles/zsh
- resources/share/i3-xfce/roles/zsh/files
- resources/share/i3-xfce/roles/zsh/files/zsh
- resources/share/i3-xfce/roles/zsh/tasks
- src/bin
- src/share
- src/share/i3-xfce
- src/share/i3-xfce/roles
- src/share/i3-xfce/roles/i3
- src/share/i3-xfce/roles/i3/files
- src/share/i3-xfce/roles/i3/files/autostart
- src/share/i3-xfce/roles/i3/files/xfce
- src/share/i3-xfce/roles/i3/tasks
- src/share/i3-xfce/roles/themes
- src/share/i3-xfce/roles/themes/files
- src/share/i3-xfce/roles/themes/files/autostart
- src/share/i3-xfce/roles/themes/files/compton
- src/share/i3-xfce/roles/themes/files/conky
- src/share/i3-xfce/roles/themes/files/fonts
- src/share/i3-xfce/roles/themes/files/i3
- src/share/i3-xfce/roles/themes/files/lightdm
- src/share/i3-xfce/roles/themes/files/xfce
- src/share/i3-xfce/roles/themes/tasks
- src/share/i3-xfce/roles/utilities
- src/share/i3-xfce/roles/utilities/files
- src/share/i3-xfce/roles/utilities/tasks
- src/share/i3-xfce/roles/zsh
- src/share/i3-xfce/roles/zsh/files
- src/share/i3-xfce/roles/zsh/files/zsh
- src/share/i3-xfce/roles/zsh/tasks
- files modified:
- MANIFEST.in
expand all
collapse all
added
removed
resources/roles/themes/files/xfce/Numix_Lightbulb.png
resources/share/i3-xfce/roles/themes/files/xfce/Numix_Lightbulb.png
src/share/i3-xfce/roles/themes/files/xfce/Numix_Lightbulb.png
