~ubuntu-branches/ubuntu/oneiric/psi/oneiric

Viewing changes to src/applicationinfo.cpp

Committer: Bazaar Package Importer
Author(s): Andreas Wenning
Date: 2009-05-04 07:41:20 UTC
mfrom: (6.1.1 squeeze)
Revision ID: james.westby@ubuntu.com-20090504074120-iui3exld9scpfwrd

Tags: 0.12.1-1ubuntu1

* Merge with Debian unstable; remaining Ubuntu changes:
  - Upstream commit d440f16e1241915fed1d859c93ab54cb738112af; applied
    inline. To make psi work with Qt 4.5
  - debian-control: Don't build-depend on Qt << 4.5.0

files added:
cutestuff/network/socks.cpp.orig

src/tools/idle/win32/idleui.dll

src/tools/zip/minizip/win32/libz.a

win32/tod.exe

files removed:
doc/api

src/tools/svgstreamviewer/files

files modified:
README

cutestuff/network/socks.cpp

debian/changelog

debian/control

mac/Info.plist

mac/Makefile

src/applicationinfo.cpp

Show diffs side-by-side

added added

removed removed

src/applicationinfo.cpp

#define PROG_NAME "Psi"

//#define PROG_VERSION "0.12-dev" " (" __DATE__ ")"; //CVS Builds are dated

#define PROG_VERSION "0.12";

#define PROG_VERSION "0.12.1";

#define PROG_CAPS_NODE "http://psi-im.org/caps";

#define PROG_CAPS_VERSION "0.12";

#define PROG_CAPS_VERSION "0.12.1";

#define PROG_IPC_NAME "org.psi-im.Psi" // must not contain '\\' character on Windows

#define PROG_OPTIONS_NS "http://psi-im.org/options";

#define PROG_STORAGE_NS "http://psi-im.org/storage";

Older »