remove xresources submodule
add xresources back as a subtree
remove xfce4-terminal-colors-solarized submodule
add xfce4-terminal back as a subtree
remove xchat-colors-solarized submodule
add xchat back as a subtree
remove solarized-qtcreator submodule
add qtcreator back as a subtree
remove gedit submodule
add gedit back as a subtree
merge upstream gedit changes
merge upstream xfce4-terminal changes