← Back to branch summary

~dkotrada/pomidor/trunk

~dkotrada/pomidor/trunk

Viewing all changes in revision 17.

Committer: Dieter Konrad
Date: 2013-04-09 16:53:07 UTC
mfrom: (5.1.7 pomidor)
Revision ID: dkotrada@gmail.com-20130409165307-jt6bxzslcxbpgry6

resolved conflicts

files added:
AUTHORS

COPYING

bin

bin/pomidor

data

data/glib-2.0

data/glib-2.0/schemas

data/glib-2.0/schemas/gschemas.compiled

data/glib-2.0/schemas/net.launchpad.pomidor.gschema.xml

data/media

data/media/background.png

data/media/pomidor.svg

data/ui

data/ui/AboutPomidorDialog.ui

data/ui/PomidorWindow.ui

data/ui/about_pomidor_dialog.xml

data/ui/pomidor_window.xml

debian

debian/changelog

debian/compat

debian/control

debian/copyright

debian/rules

help

help/C

help/C/en.page

help/C/figures

help/C/figures/picon.png

help/C/index.page

help/C/ru.page

help/C/topic1.page

po

po/pomidor-de.po

po/pomidor-ru.po

po/pomidor.pot

pomidor

pomidor.desktop.in

pomidor/AboutPomidorDialog.py

pomidor/PomidorWindow.py

pomidor/__init__.py

pomidor/pycanberra.py

pomidor_lib

pomidor_lib/AboutDialog.py

pomidor_lib/Builder.py

pomidor_lib/Window.py

pomidor_lib/__init__.py

pomidor_lib/helpers.py

pomidor_lib/pomidorconfig.py

setup.py

files removed:
AUTHORS

COPYING

bin

bin/pomidor

data

data/glib-2.0

data/glib-2.0/schemas

data/glib-2.0/schemas/gschemas.compiled

data/glib-2.0/schemas/net.launchpad.pomidor.gschema.xml

data/media

data/media/background.png

data/media/pomidor.svg

data/ui

data/ui/AboutPomidorDialog.ui

data/ui/PomidorWindow.ui

data/ui/about_pomidor_dialog.xml

data/ui/pomidor_window.xml

debian

debian/changelog

debian/compat

debian/control

debian/copyright

debian/rules

help

help/C

help/C/en.page

help/C/figures

help/C/figures/picon.png

help/C/index.page

help/C/ru.page

help/C/topic1.page

po

po/pomidor-de.po

po/pomidor-ru.po

po/pomidor.pot

pomidor

pomidor.desktop.in

pomidor/AboutPomidorDialog.py

pomidor/PomidorWindow.py

pomidor/__init__.py

pomidor/pycanberra.py

pomidor_lib

pomidor_lib/AboutDialog.py

pomidor_lib/Builder.py

pomidor_lib/Window.py

pomidor_lib/__init__.py

pomidor_lib/helpers.py

pomidor_lib/pomidorconfig.py

setup.py

Show diffs side-by-side

added added

removed removed

data/glib-2.0/schemas/

data/glib-2.0/schemas/

data/glib-2.0/schemas/gschemas.compiled

data/glib-2.0/schemas/gschemas.compiled

data/glib-2.0/schemas/net.launchpad.pomidor.gschema.xml

data/glib-2.0/schemas/net.launchpad.pomidor.gschema.xml

data/media/background.png

data/media/background.png

data/media/pomidor.svg

data/media/pomidor.svg

data/ui/AboutPomidorDialog.ui

data/ui/AboutPomidorDialog.ui

data/ui/PomidorWindow.ui

data/ui/PomidorWindow.ui

data/ui/about_pomidor_dialog.xml

data/ui/about_pomidor_dialog.xml

data/ui/pomidor_window.xml

data/ui/pomidor_window.xml

debian/changelog

debian/changelog

debian/copyright

debian/copyright

help/C/figures/

help/C/figures/

help/C/figures/picon.png

help/C/figures/picon.png

help/C/index.page

help/C/index.page

help/C/topic1.page

help/C/topic1.page

po/pomidor-de.po

po/pomidor-de.po

po/pomidor-ru.po

po/pomidor-ru.po

pomidor.desktop.in

pomidor.desktop.in

pomidor/AboutPomidorDialog.py

pomidor/AboutPomidorDialog.py

pomidor/PomidorWindow.py

pomidor/PomidorWindow.py

pomidor/__init__.py

pomidor/__init__.py

pomidor/pycanberra.py

pomidor/pycanberra.py

pomidor_lib/AboutDialog.py

pomidor_lib/AboutDialog.py

pomidor_lib/Builder.py

pomidor_lib/Builder.py

pomidor_lib/Window.py

pomidor_lib/Window.py

pomidor_lib/__init__.py

pomidor_lib/__init__.py

pomidor_lib/helpers.py

pomidor_lib/helpers.py

pomidor_lib/pomidorconfig.py

pomidor_lib/pomidorconfig.py

Older »