← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/Mumble.proto

Committer: Bazaar Package Importer
Author(s): Thorvald Natvig
Date: 2009-12-01 22:23:56 UTC
mto: (1.4.1 upstream) (9.3.1 sid)
mto: This revision was merged to the branch mainline in revision 13.
Revision ID: james.westby@ubuntu.com-20091201222356-mzod2sr34j2t132j

Tags: upstream-1.2.0~beta2

Import upstream version 1.2.0~beta2

files added:
plugins/codmw2

plugins/codmw2/codmw2.cpp

plugins/codmw2/codmw2.pro

plugins/codmw2so

plugins/codmw2so/codmw2so.cpp

plugins/codmw2so/codmw2so.pro

plugins/manual

plugins/manual/manual.cpp

plugins/manual/manual.h

plugins/manual/manual.pro

plugins/manual/manual.ui

samples/Critical.ogg

samples/PermissionDenied.ogg

samples/SelfMutedDeafened.ogg

samples/ServerConnected.ogg

samples/ServerDisconnected.ogg

samples/TextMessage.ogg

samples/UserJoinedChannel.ogg

samples/UserKickedYouOrByYou.ogg

samples/UserLeftChannel.ogg

samples/UserMutedYouOrByYou.ogg

symbols.pri

files removed:
overlay_macx/app.pri

files modified:
CHANGES

celt-0.7.0-build/celt-0.7.0-build.pro

compiler.pri

g15helper/g15helper.h

g15helper/g15helper.pro

g15helper/g15helper_macx.c

icons/authenticated.svg

icons/comment.svg

icons/comment_seen.svg

overlay_gl/overlay.c

overlay_macx/launcher/launcher.pro

overlay_macx/overlay/overlay.pro

plugins/aoc/aoc.cpp

plugins/cod5/cod5.cpp

plugins/css/css.cpp

plugins/hl2dm/hl2dm.cpp

plugins/insurgency/insurgency.cpp

plugins/l4d/l4d.cpp

plugins/link/link.pro

plugins/plugins.pri

plugins/plugins.pro

plugins/tf2/tf2.cpp

plugins/wow/wow.cpp

scripts/murmur.ini

scripts/murmur.ini.system

src/Connection.cpp

src/Mumble.proto

src/Net.cpp

src/PacketDataStream.h

src/Version.h

src/mumble/Audio.cpp

src/mumble/Audio.h

src/mumble/AudioOutput.cpp

src/mumble/AudioOutput.ui

src/mumble/AudioWizard.ui

src/mumble/BanEditor.cpp

src/mumble/Cert.cpp

src/mumble/Cert.ui

src/mumble/ClientUser.cpp

src/mumble/ClientUser.h

src/mumble/ConfigDialog.mm

src/mumble/ConnectDialog.cpp

src/mumble/CoreAudio.cpp

src/mumble/Database.cpp

src/mumble/G15LCDEngine_lglcd.cpp

src/mumble/G15LCDEngine_lglcd.h

src/mumble/GlobalShortcut.cpp

src/mumble/GlobalShortcut.h

src/mumble/LCD.cpp

src/mumble/LookConfig.ui

src/mumble/MainWindow.cpp

src/mumble/MainWindow.h

src/mumble/Messages.cpp

src/mumble/Overlay.cpp

src/mumble/ServerHandler.cpp

src/mumble/ServerHandler.h

src/mumble/Settings.cpp

src/mumble/Usage.cpp

src/mumble/Usage.h

src/mumble/UserModel.cpp

src/mumble/UserView.cpp

src/mumble/main.cpp

src/mumble/mumble.plist

src/mumble/mumble.pro

src/mumble/mumble.qrc

src/mumble/mumble_cs.ts

src/mumble/mumble_de.ts

src/mumble/mumble_en.ts

src/mumble/mumble_es.ts

src/mumble/mumble_fr.ts

src/mumble/mumble_it.ts

src/mumble/mumble_ja.ts

src/mumble/mumble_pl.ts

src/mumble/mumble_ru.ts

src/mumble/mumble_zh_CN.ts

src/mumble/mumble_zh_TW.ts

src/mumble11x/ConfigDialog.mm

src/mumble11x/CoreAudio.cpp

src/mumble11x/mumble11x.plist

src/mumble11x/mumble11x.pro

src/murmur/Messages.cpp

src/murmur/Meta.cpp

src/murmur/Meta.h

src/murmur/MurmurIce.cpp

src/murmur/RPC.cpp

src/murmur/Server.cpp

src/murmur/Server.h

src/murmur/ServerDB.cpp

src/murmur/murmur.pro

Show diffs side-by-side

added added

removed removed

src/Mumble.proto

43

43

WrongServerPW = 4;

44

44

UsernameInUse = 5;

45

45

ServerFull = 6;

46

NoCertificate = 7;

46

47

}

47

required RejectType type = 1;

48

optional RejectType type = 1;

48

49

optional string reason = 2;

49

50

}

50

51

134

135

optional uint32 channel_id = 2;

135

136

optional uint32 session = 3;

136

137

optional string reason = 4;

137

optional uint32 type = 5;

138

optional DenyType type = 5;

138

139

}

139

140

140

141

message ACL {

Older »