diff options
| author | Ladislav Hagara | 2011-09-29 00:49:25 +0200 |
|---|---|---|
| committer | Ladislav Hagara | 2011-09-29 00:49:25 +0200 |
| commit | 1fb3b91d0acbeb95cc75d2d75d236a3b26b99906 (patch) | |
| tree | 877e8325cd09c904f4e0b59d71f5b2c6f479f2b5 /gnome3-libs/gnome-desktop3 | |
| parent | a9fd931aebca7209ab3f73269eff68d3855edd58 (diff) | |
| parent | ddb56cad0ae7b5ddae69f9b7ea6f8bbbf9f437cc (diff) | |
Merge branch 'master' into gnome
Conflicts:
gnome2-apps/empathy/HISTORY
gnome2-apps/epiphany/DETAILS
gnome2-apps/epiphany/HISTORY
gnome2-apps/gucharmap/HISTORY
gnome2-libs/evolution-exchange/HISTORY
gnome2-libs/glib2/glib-2.28.8.tar.bz2.sig
gnome2-libs/gvfs/HISTORY
gnome2-libs/vte/vte-0.28.2.tar.bz2.sig
gnome3-libs/gnome-desktop3/HISTORY
net/network-manager/HISTORY
net/unbound/DETAILS
net/unbound/HISTORY
security/wireshark/DETAILS
security/wireshark/HISTORY
x11-libs/cairomm/HISTORY
Diffstat (limited to 'gnome3-libs/gnome-desktop3')
| -rwxr-xr-x | gnome3-libs/gnome-desktop3/DETAILS | 2 | ||||
| -rw-r--r-- | gnome3-libs/gnome-desktop3/HISTORY | 3 | ||||
| -rw-r--r-- | gnome3-libs/gnome-desktop3/gnome-desktop-3.0.0.tar.bz2.sig | bin | 287 -> 0 bytes | |||
| -rw-r--r-- | gnome3-libs/gnome-desktop3/gnome-desktop-3.0.2.tar.bz2.sig | bin | 0 -> 287 bytes |
4 files changed, 4 insertions, 1 deletions
diff --git a/gnome3-libs/gnome-desktop3/DETAILS b/gnome3-libs/gnome-desktop3/DETAILS index 4777cd30da..2f0a30f4a6 100755 --- a/gnome3-libs/gnome-desktop3/DETAILS +++ b/gnome3-libs/gnome-desktop3/DETAILS @@ -1,5 +1,5 @@ SPELL=gnome-desktop3 - VERSION=3.0.0 + VERSION=3.0.2 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=gnome-desktop-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-desktop-$VERSION diff --git a/gnome3-libs/gnome-desktop3/HISTORY b/gnome3-libs/gnome-desktop3/HISTORY index 2dd15c28a8..b20978ce4e 100644 --- a/gnome3-libs/gnome-desktop3/HISTORY +++ b/gnome3-libs/gnome-desktop3/HISTORY @@ -2,5 +2,8 @@ * DEPENDS: added dependency on gsettings-desktop-schemas and gdk-pixbuf2 +2011-05-26 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.0.2 + 2011-04-25 Ladislav Hagara <hgr@vabo.cz> * *: spell created, based on gnome-desktop diff --git a/gnome3-libs/gnome-desktop3/gnome-desktop-3.0.0.tar.bz2.sig b/gnome3-libs/gnome-desktop3/gnome-desktop-3.0.0.tar.bz2.sig Binary files differdeleted file mode 100644 index 0e243bf203..0000000000 --- a/gnome3-libs/gnome-desktop3/gnome-desktop-3.0.0.tar.bz2.sig +++ /dev/null diff --git a/gnome3-libs/gnome-desktop3/gnome-desktop-3.0.2.tar.bz2.sig b/gnome3-libs/gnome-desktop3/gnome-desktop-3.0.2.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..fc1b737236 --- /dev/null +++ b/gnome3-libs/gnome-desktop3/gnome-desktop-3.0.2.tar.bz2.sig |