labofsahil/github-event-dataset-2012 huggingface dataset:
Add forgotten sigil
Remove SQL Console link
Make "Calendar" a plugin
Unbroken NSMB Grassland theme
Git, stop annoying me with unexistant changes in those two files
Fixed youtube tag
Merge branch 'master' of github.com:Dirbaio/ABXD
Fixed nsmb1 theme
Fixed bbcode putting spaces everywhere, and html entities are now allowed again.
Fixed homepage link in profile.
Security fix
asdfadsfasdf
Fixed fail in [url] tags
Fixed accents
Make it possible to read private messages for local moderators.
It turns out that ENT_HTML401 is default anyways even when not specified and it seems to break PHP 5.3 for some reason (lack of constant).
Screw buttons, we don't need them.
My nick is "John37" and registration form warns me about this name. Fix it.

But seriously, it's intentional.
Fix style of unoriginal names plugin
Fixed post preview in layout maker.
Added an option to not color usernames based on gender :)
Use 301 redirct for post.php
WIP MAIN settings rework
updated citation-info
started vignette
arquivos re-excluidos
Merge branch 'master' of https://github.com/Eilem/TalkTo

Conflicts:
	nbproject/project.properties
v0.80.1.0:
	- Release.
bye bye shineey
new readme link
Bug fix to correctly get dimensions
folder casing
folder capitalisation references
Merge branch 'master' into beta

Conflicts:
	gamemode/fadmin/cl_interface/cl_start.lua
	gamemode/fadmin/messaging/sh_shared.lua
	gamemode/fadmin/playeractions/health/cl_init.lua
	gamemode/modules/HungerMod/player.lua
	gamemode/modules/afk/sv_AFK.lua
	gamemode/modules/hungermod/player.lua
	gamemode/modules/hungermod/sv_HungerMod.lua
	gamemode/modules/hungermod/sv_player.lua
nettoyage continu
[ticket/10981] Modified travis to use composer with --dev

PHPBB3-10981
Update features-json/rem.json

Updated with the correct hash.
Merge pull request #68 from simevidas/patch-2

Update features-json/rem.json
Fix the wording in the "core.pager" section.
naiveBayes classifier written
添加 ResourceLoader
change
all
Change yeeld to yielde and misc changes
ignoring rankfil
documenting GBP
walkthrough
SWIM and SoS were out of order
add the application form
checking in conv stuff Dse09
add ie9, change port
finished login, not stable though
Unified and scaled logos
ping ultrasonic
Merge branch 'master' of https://github.com/JonasT/HaPra
ADC added to P17. but i need a wire to test it.
Removed useless purge of libsmbclient

It's installed again one step further
Added XVDR PVR add-on compile how-to
Поразукрасил профиль товаров и внес небольшие правки
minor fix for interface niggle in edit torrent
made open/close text for browse torrents synch up in ie, even though load cookie still dosent fire. The addDomLoadEvent gazelle uses has always had a known bug with ie which is going to be troublesome to sort. grrrrr...
Prevent/error out on invalid chars in tags instead of silently modifying them
width fix for collage images
git-svn-id: https://spartan.csl.sri.com/svn/public/pvs/trunk@6047 ab98feae-9515-0410-836f-c1e8bd48b6aa
nomsg

git-svn-id: https://spartan.csl.sri.com/svn/public/pvs/trunk@6048 ab98feae-9515-0410-836f-c1e8bd48b6aa
Minor fixes in path structure
Fix on header
Minor fix in files
Changing structure of the main file
Fix UTF-8 error
Edit header
Minor str fix
Minor. Fix checking backup folder
Some fix
Some fix
Fix
Fix
Fix #2
Clear
Bumped version number to 0.1.0
Add versions and copyright
Merge branch 'release-0.1.0'
Se agrega log al bot
- Configured appengine-web.xml to support google app engine sdk1.7.3

Signed-off-by: Luo Jia <jluojia@gmail.com>
Scripts/BoT: WaterBombTimer.....
Track @imported files to aid stale cache detection.
"Sponsor" image
!MIGRATE! Team applications (Team owner side)
- Team application viewing
- Team application accepting
- Team application denying
- Team application description editing
MGR change supar
Implemented Added Time.
Implemented 'Source' type.
Added EntityList window
code refactoring of Core
Merge branch 'feature-upfront-method-declarations'
Make changes to compile with CDH4.

- Change Hadoop dependencies:
  * "hadoop-client" % "2.0.0-mr1-cdh4.0.0"
  * "hadoop-core" % "2.0.0-mr1-cdh4.0.0"
- TaskAttemptContext - now an interface, not a class
- JobContext - now an interface, not a class
- filesStatus and globStatus throw an exception if path doesn't exist
- SequenceFile.Reader API change
- isDir deprecated in favor of isDirectory

Note that Avro I/O does not yet work.
fixed the keepFile argument usage in HadoopExamples
Merge remote-tracking branch 'origin/master'
_log_file, not log_file
added doctrine2
reworked config and controllers
Moved code for admin panel footer/favicon into activation.php. Foundation topbar font-weight set to normal
billing jar
Fix the readout transfer size.
Update audios
This is updating the way we load stuff
update jSQL.
Created public folder
Created ‘Designing for different devices’ doc, with note about Retina images
No restrict access to companies
Wrap all outputting in futures so that err and out are processed at the same time.
remove incorrect test that assumes df_matrix is current
support lua 5.2
fix tightboundingbox option
Fixed const-ness
tweak demos for 4.6 online version
bug fixes when histograms are mixed with other plot styles
tweak demos for 4.6
Fix clipping of pure horizontal or vertical lines that span the entire plot to end on the boundary
draw complete arc even if smaller than 3 degrees
fix order-dependence of stats options
document bgnd color options
Fix unterminated blocks (missing }) in batch mode
*** empty log message ***
update latex tutorial for 4.6
wxt horizontal mouse scrolling
update
update
update
*** empty log message ***
tweak docs
Correctif: Ajout du champ num_semaines_etab s'il n'existe pas dans edt_semaines
Merge branch 'release-1.6.0' into release-1.6.1
Correctif sur le nettoyage de acces_cdt_groupe lors de la suppression d'un groupe. Et prise en compte pour le nettoyage des groupes.
Merge branch 'release-1.6.0' into release-1.6.1
Correctif sur le remplissage de edt_semaines.
Merge branch 'release-1.6.0' into release-1.6.1
Fonction check_utf8 : modification du test avec exp. reg. pour qui
provoquait des crashs Apache sous Win$
Correction alignement absence en html
Merge remote branch 'regis/corrige_carnet_html' into release-1.6.1
Ajout d'un test sur les chaines utf8 invalides de petite et de grande taille
Merge remote branch 'joss/production' into release-1.6.1
Revert "Fonction check_utf8 : modification du test avec exp. reg. pour qui"

This reverts commit d9ef04c589c5d62ddf2ce7b3ad462d9c73959de5.
Correctif sur l'accès au formulaire de recherche si javascript est désactivé.
Merge branch 'release-1.6.1'
discipline → affichage matériel des retenus + correction travail à faire
added invalid contract purger
生成部署文件
CrazyChats: added listname default prefixes, added group commands
CrazyLoginFilter: fixed bugs from first alpha test, resort columns
CrazyArenaSpleef: first upload
CrazyLocale: updated alternative path searching
CrazyCore: sendLocaleMessages for Collections
CrazyArena: code rework
fixed broken append call
Preferences: Removes avatar on left, checkbox dependency with b_show_info
Closes #1119.
Merge pull request #1126 from lfottaviano/master

Preferences: Closes #1119
Use languages names instead of codes on preferences.
Refs #1122
Merge branch 'master' of github.com:emesene/emesene

Conflicts:
	emesene/Language.py
More refactor to language.py
Refs #1122
Update some language names.
Refs #1122
Fixes #1128
Fixes #1129
Translate langague names to it's native language. Part 2.
Closes #1122
Split languages, one for each line.
i18n: Sync the translations with launchpad
Runs on clean WinXP install + MSVC 2010 Redist.
Enable a factory approach to loadShader() too
Refactoring Shader/ResourceManager stuff

	- ResourceManager can now load() shaders using a factory or the
	  class type.
	- GlslShader is now an ABC ontop the Shader interface, formally
	  it was *the* interface.
	- Better code reuse in the ResourceManager and *Shader classes.
	- Demo code in Main.
	- Tags file freshened.
Update AndroidGlsl* classes to match last commit
Fix Log calls in ResourceManager.load().
Move load() demo to PcDisplay with other test code.
Added docs/porting.txt
Added short quasi useless doc on making a game
Add montage and component prefixes to classes
Style fixes and some commands for IRC users.
Cleaned up video flagging code to make it easier to invoke from telnet.
First commit from EGit
Added in custom file save capabiltiy
add file of excercise 2.61
Use anchor tags instead of list elements on new tab page.
User Tableにdomain, image, available Field追加
postに必要ないdomainフィールド追加してしまってたので削除
Posts Tableに domain, image, available Fields追加
Fixed CMake (PROJECT_ should have been LIB_) and made the Camera class cache the view-projection matrix
toString() implementation for headers and include in the IHeader interfaces
so many changes, commit for backup etc.
1.0.3: Links, web security and light indicator
* grab mouse at start and shader cleanup
Removendo plugins do Jquery e adicionando o twitter bootstrap
mysql5.5 required some special handling
Move nativegen.py to project root
Added same minimum requirement for the Stepper 1 interface.
Fixes for Internet Explorer and the Closure Compilable Flapjax
Created a VideoPlayerWidget that supports webm, mp4 and ogv with a flash based mp4 fallover. This supports Firefox, Chrome and Internet Explorer 7, 8 and 9
Fixed some random IE related issues with JQPlot and Ex Canvas
Created an Email Sending request
Made a product widget that uses a PayPal shopping cart.
Fixes for the contact form
Created a widget that displays two different images based on if the user is logged in or not
Fixed this relative path issue
Various fixes
initial commit, with network-connection speed work
static rails implementation of initial network-connection stuff
lib/javascripts
Levels also load help text in the same directory
Merge branch 'master' of github.com:aarmea/mumei
Gravity!

The player is now affected by gravity, which is implemented by
calling relMove down every time the frame is redrawn.
Merge branch 'master' of github.com:aarmea/mumei
revised and standardized tutorials for level 3
Autolabor: add health awareness, fix initialization crash, fix idle dwarf loop crash
Compile with fPIC under Intel compiler

To support building a dynamic library for the Python bindings.
Merge pull request #87 from adamreeve/python

Compile with -fPIC under Intel compiler
Changes according to Prasad's comments
Adding coordinate system to an interface

Changes according to Prasad's comment.

Tracker item: 3118
Merge pull request #86 from xyan075/master

Add coordinate system to interface
Add public distributed matrix/vector routines

These allow people to get access to matrix and vector data. For sparse
matrices the row and column indices can also be obtained.
Add routines for obtaining solver/equations matrices and vectors
Add method to create a SciPy sparse matrix from a distributed matrix

This will also reshape matrix data for full matrices (from 1D matrix
data to a 2D matrix).

Tracker item 2147
Fix getting sparse matrix data from PETSc

- Fixed MatGetArrayF90 in cmiss_petsc.f90 to use a 2D array argument.

- In distributed_matrix_data_get, cast the result to a 1D array with the
  correct dimensions.

PETSc's Fortran bindings have an error where they return a 2D array even
for sparse matrices from MatGetArrayF90. This meant that when treating
this as a 1D array we only got the first m non-zero values and when
using the C and Python bindings we got a segfault when using C_LOC.

There was some discussion about this on the PETSc mailing list but
nothing was done about it, leaving no way to properly get the matrix
data for a sparse matrix from Fortran:
http://lists.mcs.anl.gov/pipermail/petsc-users/2009-June/004682.html
http://lists.mcs.anl.gov/pipermail/petsc-users/2009-July/004687.html
merge
merge
Merge remote-tracking branch 'yupe/master'

Conflicts:
protected/modules/catalog/CatalogModule.php
code db
ddrescue 1.16
fbida: help the linker find iconv symbols

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
geeqie: depends on x11

Fixes #13492.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Added QSR
-C mode segfeult fixed and something something I don't remember
fixed up base
build-ruby-parallel implemented.
removed unused theme.
update dist overlay 0.9.1
添加 overlay 的 alias
修改 dialog 的相对路径
Merge branch 'master' of github.com:alipay/arale
rename uniqueClass method to stamp
rebuild widget 0.8.2
rebuild widget 0.8.2
Merge branch 'master' of github.com:alipay/arale
improve widget docs and example
Update UserRoleMapper to support SuperUser
Allow auditor users, premium collection agents
and cfe admins to contact support
Add application list in Samples.
Update src/game/UnitAuraProcHandler.cpp
added Gemfile (just points to gemspec)
* internal.h (rb_execarg_new): declared.
  (rb_execarg_get): ditto.

* process.c (mark_exec_arg): new function.
  (free_exec_arg): ditto.
  (memsize_exec_arg): ditto.
  (exec_arg_data_type): defined.
  (rb_execarg_new): new function.
  (rb_execarg_get): ditto.
  (rb_f_exec): use rb_execarg_new.
  (rb_spawn_internal): ditto.
  (rb_f_spawn): ditto.

* io.c (pipe_open_v): use rb_execarg_new.
  (pipe_open_s): ditto.

* ext/pty/pty.c (establishShell): use rb_execarg_new.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* internal.h (struct rb_execarg) moved and renamed from
  struct rb_exec_arg in intern.h.

* include/ruby/intern.h (struct rb_exec_arg): refer Data object which
  contains struct rb_execarg.

* process.c: use struct rb_execarg instead of struct rb_exec_arg
  except functions declared in intern.h.
  (rb_exec_arg_addopt): extract a pointer to struct rb_execarg from
  struct rb_exec_arg.
  (rb_exec_arg_init): ditto.
  (rb_exec_arg_fixup): ditto.
  (rb_run_exec_options_err): ditto.
  (rb_run_exec_options): ditto.
  (rb_exec_err): ditto.
  (rb_exec): ditto.

* io.c: use struct rb_execarg instead of struct rb_exec_arg.

* ext/pty/pty.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* internal.h (struct rb_execarg): add umask_given and umask_mask
  fields.

* process.c (STATIC_ASSERT): removed.
  (rb_execarg_addopt): follow the rb_execarg change.
  (rb_execarg_run_options): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fix a typo

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2012-06-21

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* process.c (rb_execarg_fixup): take a VALUE argument instead of
  struct rb_execarg.

* internal.h (rb_execarg_fixup): follow the definition change.

* io.c (pipe_open): follow rb_execarg_fixup change.

* ext/pty/pty.c (establishShell): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* error.c (err_append): rename err_append() to compile_err_append()
  and move definition body.  err_append() is used only by compiling.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
process.c: fix type

* process.c (rb_spawn_internal): fix type of a local variable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge branch 'trunk' of git://github.com/ruby/ruby into trunk
Vorlesung vom 8.5.12
Try to make a branch and so on
Angband 2.9.6-alpha2
add logging to tests using slf4j-log4j12
experimentally switch over one of the cli tests to using this.getClass().getResource to see if it works on the jenkins server
Added RETFIE operation.
Merge remote-tracking branch 'Sipic/develop' into develop
Added DLL_API #define
Fixed RA while running ISR. Fixed MUL.SS, MUL.SU.
FLUME-1803. Generated dist tarball is missing flume-ng-embedded-agent.

(Hari Shreedharan via Mike Percy)
HBASE-7431 TestSplitTransactionOnCluster tests still flaky

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1425573 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7357  Use hbase.security.authentication for client / server security negotiation

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1423997 13f79535-47bb-0310-9956-ffa450edef68
vote, promote


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422574 13f79535-47bb-0310-9956-ffa450edef68
ipromote


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422868 13f79535-47bb-0310-9956-ffa450edef68
update README
Add index.html
Use RelationModel to hold its own contents and pass back to ObjectBrowser.

Passing the work object back to the browser was a bit naff. The model
really needs a cleanup, and disassociating from the view a bit
(definitely required for multiple views support)
Move implementations of object browser database work into a new translation unit
use new QueryLike functionality for convenience
README
update README to include ESP
docs
adding get table name method, and tablename local member
cams
ca
rename edit_til -> edit_note
view_til -> view_note
changed: better close semantic for everything
added: some comments
Add xserver integration of i3 WM.

This allows to set i3 as the default window manager in the system configuration.
* Add a ‘size’ option to ‘swapDevices’ to create swapfiles on the fly.

svn path=/nixos/trunk/; revision=34478
* Test swapfile creation.

svn path=/nixos/trunk/; revision=34479
* Actually use the security.pam.enableSSHAgentAuth option.

  http://hydra.nixos.org/build/2698800

svn path=/nixos/trunk/; revision=34483
* Oops, fix an incomplete commit.

svn path=/nixos/trunk/; revision=34488
* Use ‘nologin’ as the default shell for user accounts that are not
  allowed to log in.

svn path=/nixos/trunk/; revision=34514
synaptics driver: accelleration factor config option

svn path=/nixos/trunk/; revision=34523
Merge pull request #1 from aszlig/i3_integration

Add xserver integration of i3 WM.
* Make sure time.timeZone can only be defined once.
nixos-version: "pre-svn" -> "pre-git"
Use BusyBox in the initrd

Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd.  In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots.  It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
Don't include klibc in the installation CD
Fix booting from the CD-ROM

So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM.  We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin.  So make sure
the "iso9660" module is loaded.
stage-1: mount /proc, /sys, /dev in the target root

The switch_root in BusyBox doesn't do this (while the one in
util-linux does).  So we have to do this ourselves.
Add Busybox to the installation CD

This is mostly to get the automated tests to succeed.
Test driver: exit when all VMs have exited rather than sleeping forever
Drop the socat wrapper
Fix booting on EC2

The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
[Amazon] Some changes

* Remove a test for getters/setters
* Throw exception when item-list is empty
Merge branch 'service-amazon' of https://github.com/Maks3w/zf2 into hotfix/service-amazon-tests
Base class for plugin manager factories.

Adds the DiAbstractServiceFactory and DiServiceInitializer to the plugin managers
[zen-70] Options annotation

- Added missing "Options" annotation, for providing options to forms,
  fieldsets, and elements
Merge remote-tracking branch 'weierophinney/feature/form-annotation-options'
Merge remote-tracking branch 'SocalNick/hotfix/di-plugin-managers'

PR #1762
修改了mysql的jar包，
[ticket/10981] Added goutte via composer

composer.phar added and autoloaded before tests

PHPBB3-10981
[ticket/10981] Modified functional framework to account for goutte changes

PHPBB3-10981
[ticket/10981] Removed setupBeforeClass

PHPBB3-10981
[ticket/10981] Modified travis to use composer with --dev

PHPBB3-10981
[ticket/10981] Added check for PHP version before running composer

PHPBB3-10981
Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus

* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
remove unused code. collecting exceptions in retval doesn't really work.
move completely to github
i001_z001
i001_z005
i001_z005
i001_z005
i001_i005
i001_i005
Task 3 implemented.
i001_z005
i001_z005
Task 3 implemented.
i001_z005
i001_i005
i001_z005
i001_z001
i001_z005
i001_z005
i001_i005
Task 3 implemented.
i001_z005
i001_z005
Adding some style to listing
Some tweaks with async components
Fix paths for rust 0.5.
Merge pull request #8 from erickt/master

Fix paths for 0.5
Docks are embedded in the menu bar now
Merge pull request #696 from bmantra/master

Closes #661  Glassfish 3.1.1 war upload csrf
added a chrome_extension module that takes a screenshot of the current tab, image returned as dataurl for now
Merge pull request #700 from bmantra/master

Closes #699
Moved screenshot module to correct location
Changes debug logs in the evasion main class.
Version updated
Added update file that calls git pull
Added comment
Changed print_success to print_info
Added Spring Framework Malicious JAR module

Fixes issue #526
Added balloon popups to hooked browser tree

Part of issue #521
Moved a few modules from modules/exploits/ to modules/exploits/local_host:
	activex_command_execution
	mozilla_nsiprocess_interface
	window_mail_client_dos
	java_payload
	safari_launch_app

Added a couple of XSS modules:
	cisco_collaboration_server_5_xss
	serendipity_1.6_xss
Added Virgin Superhub CSRF module

Fixes issue #703
Merge branch 'master' of github.com:beefproject/beef
Added a couple of CSRF modules:

	o ./modules/exploits/boastmachine_3_1_add_user_csrf/
	o ./modules/exploits/axous_1_1_1_add_user_csrf/

Updated a few exploit titles
Merge branch 'master' of https://github.com/beefproject/beef
Added browser details to Hooked Browser balloon messages

Fixes issue #521
Updated a couple of module configs

modules/exploits/router/virgin_superhub_csrf/config.yaml
modules/misc/local_file_theft/config.yaml
Changed default target IP address to `http://192.168.100.1/` for the
virgin_superhub_csrf module
Removed duplicate `/` from a few CSRF URLs

Just in case it causes issues
InvocationTargetException, used getMessage but this is not set. Now uses the target's message
Provided backward compatibility support for ANNOTATION,
which was turned in ANNOTATED
Close Jar before rename on file

The Jar class holds a Zipfile that keeps references open to the underlying
file. This will typicaly fail io operations such as rename/delete on
windows systems. Therefore we close it and open a new one lateron to obey
the fireBundleAdded contract.
Close Jar before rename on file

The Jar class holds a Zipfile that keeps references open to the underlying
file. This will typicaly fail io operations such as rename/delete on
windows systems.
Disable FileRepoTest#testDeployToNonexistentRepoFails() on windows
Attempt to get FileRepo#exec() to work on windows
Only open new jar if there are any listeners
Removed superfluous check on closing jar
Merge pull request #247 from bramk/fixFileRepo

Close Jar before rename on file - I assume the tests are running?
Merge branch 'master' into fixLocalIndexedRepo
Removed superfluous check on closing jar
Only open new jar if there are any listeners (align with 671162e)
Merge pull request #249 from bramk/fixFileRepoTest

Fix file repo tests on windows
Merge remote-tracking branch 'origin/master' into next
Merge pull request #248 from bramk/fixLocalIndexedRepo

Close Jar before rename on file
Merge remote-tracking branch 'origin/master' into next
#252 Negated literal import is added to import.
Negated literals are not causing imports (or exports) 
negations are ignored in general.
Merge branch 'master' into next
removes local settings
* Flat CPU modifier shouldn't modify cpu_max.
* cpu value for modifications is no longer a magic number. The cpu value now ALWAYS means CPU usage, and it must ALWAYS be negative.
* Added cpu_max node to modifications, for increasing CPU capacity. This must always be positive.
* Updated outfit XML to reflect new changes.
* Fixed some CPU related logic here and there.
Merge branch 'slots' of git://github.com/BTAxis/naev into slots
* Try to formalize being able to equip crap better.
* Changed wording: negative -> insufficient.
* Code clean up and polish.
* Reset health properly when testing stats.
- converted spaces->tabs
- added enum for ShortcutTargetTypes
replace level arrays with json
Setting the default login url
terminato lo stampaggio dei pacchetti
transfert dordi
Updated contacts
Add post (12)
Remove name from return tags
Move readFile into IO.js, add TODO to doc rest.js
make jake a dev dependency
Fixes per comments on Github
Some test naming fixes
Merge branch '182FollowUp' of https://github.com/bp323/Hilary into 182FollowUp
Merge branch 'jake' of git://github.com/stuartf/Hilary into jake
Hook `defaultaccess`, `defaultjoin`, `internalaccountcreationenabled` and `defaultlang` in to the Principals API.
Merge remote-tracking branch 'origin/master' into MoreConfigTypes
Content REST API
Content permissions
Content sharing
Content access
Started updating content
Merge branch 'RESTTesting' into RESTTestingContent
Update content
Merge branch 'master' into RESTTestingContent
Content delete
Config module and doc module
Adding missing unit tests
Increasing test coverage
Merge branch 'master' into RESTTestingContent

Conflicts:
	node_modules/oae-authz/lib/api.js
Merge pull request #198 from nicolaasmatthijs/RESTTestingContent

Rest testing part 2
Merge origin/master and fix conflicts
remove secret key from base. New one located somewhere very secret.
Merge branch 'master' of github.com:brack3t/gswd
quarks timer updated
Updated url to homepage
Script to put the leaderboard into the dest dir and to archive it.
layout changes to the flattr button
implementing scatterplot matrix
Merge branch 'master' of https://github.com/brycecr/chsi
View components can be marked as debug

Components that are marked as debug are only drawn when in debug mode.
Scene Transition Events

Changed #prepare_transition to #prepare_transition_to
And implemented #prepare_transition_from which will allow a new scene to
get details about the last scene.
Better underscorized scene naming

* Using the logic to convert camelCased names to underscored names similar to ActiveSupport.
* Better error message when a scene name is not found.
Animation, IllicitAnimation, and Easing
Version 0.0.3
Additional information on getting started
removed circular package links. link yourself when running demos.
修改个人光环过滤包含宠物。

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
顶部信息条中键显示ESC的系统菜单.
修正鼠标提示可能的出错.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
移除/dab 命令,添加删除配置存档的按键.
宠物框添加BUFF提示器.
修正一些LUA错误.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
提供浏览消息的接口
Merge branch 'refs/heads/dev' of https://github.com/cammette/tpc.git into HEAD
setup in ubuntu server
allow makefile to do a debug or a static build
logging: add useful logging to STDOUT.
Remove blub about django-activity-stream
There is no integration with this library
Update demo_script_cikm2012.md

Small wording changes
Exchange.declare now supports passive argument
Virtual now supports passive argument to exchange_declare
Use single quotes
All implemented tests are now passing.
The RegisterInfo descriptors for the convenience registers can specify an offset to be added to the offset as derived from
the value_regs field, which is useful for future expansion purposes.  As of now, we have:

    calculated_offset_of_eax = offset_of_rax + (offset_of_eax_from_the_descriptor which is 0)


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@157275 91177308-0d34-0410-b5e6-96231b3b80d8
Make git not delete my_working_dir. Otherwise a git checkout would be different from an svn checkout.

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@160506 91177308-0d34-0410-b5e6-96231b3b80d8
<rdar://problem/10103468>

Symbol files (dSYM files on darwin) can now be specified during program execution:

(lldb) target symbols add /path/to/symfile/a.out.dSYM/Contents/Resources/DWARF/a.out

This command can be used when you have a debug session in progress and want to add symbols to get better debug info fidelity.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@153693 91177308-0d34-0410-b5e6-96231b3b80d8
Remove a few debug printf's that were left in ProcessKDP.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@165192 91177308-0d34-0410-b5e6-96231b3b80d8
Updated AppleObjCV2Runtime to load the class
data structures more rapidly.  Also added fields
for the other data structures in a class.

I also fixed a problem where I accidentally used
hasExternalLexicalStorage() instead of
hasExternalVisibleStorage() to mark an
incomplete object.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@164197 91177308-0d34-0410-b5e6-96231b3b80d8
Renaming to rid of the '++' in the test file name and simplify the Makefile.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@155521 91177308-0d34-0410-b5e6-96231b3b80d8
Fix LowerJumpTable to produce instructions with the correct relocation
types for N32 ABI. Test case will be updated after the patch that fixes
TargetLowering::getPICJumpTableRelocBase is checked in.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154036 91177308-0d34-0410-b5e6-96231b3b80d8
Add soname to LLVM shared library on Linux. Probably the same stuff is necessary for *BSD.
Patch from Mageia!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153324 91177308-0d34-0410-b5e6-96231b3b80d8
Remove the CellSPU port.

Approved by Chris Lattner.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167984 91177308-0d34-0410-b5e6-96231b3b80d8
X86: Shave off one shuffle from the pcmpeqq sequence for SSE2 by making use of and commutativity.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171064 91177308-0d34-0410-b5e6-96231b3b80d8
Teach the include sorter to not choke on include guards. ;]

Kind of important when prepping the include/... tree version of the sort
changes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169132 91177308-0d34-0410-b5e6-96231b3b80d8
Sort the #include lines for the include/... tree with the script.

AKA: Recompile *ALL* the source code!

This one went much better. No manual edits here. I spot-checked for
silliness and grep-checked for really broken edits and everything seemed
good. It all still compiles. Yell if you see something that looks goofy.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169133 91177308-0d34-0410-b5e6-96231b3b80d8
va_start, va_end, va_copy: InstrinsicInst subclasses and InstVisitor support.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166916 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Add support for parsing the '.' operator.  Given,

[register].field

The operator returns the value at the location pointed to by register plus the
offset of field within its structure or union.  This patch only handles
immediate fields (i.e., [eax].4).  The original displacement has to be a
MCConstantExpr as well.
Part of rdar://12470415 and rdar://12470514



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166632 91177308-0d34-0410-b5e6-96231b3b80d8
Define load instructions with base+immediate offset addressing mode
using multiclass.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169153 91177308-0d34-0410-b5e6-96231b3b80d8
[Hexagon] Don't mark callee saved registers as clobbered by a tail call

This was causing unnecessary spills/restores of callee saved registers.

Fixes PR13572.

Patch by Pranav Bhandarkar!



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161778 91177308-0d34-0410-b5e6-96231b3b80d8
Revert -join-splitedges to a boolean cmd line option.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167880 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] We only need one bit to represent the AsmDialect in the
MachineInstr.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163257 91177308-0d34-0410-b5e6-96231b3b80d8
Use the new getRegAllocationHints() hook from AllocationOrder.

This simplifies the hinting code quite a bit while making the targets
easier to write at the same time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169173 91177308-0d34-0410-b5e6-96231b3b80d8
Functions in MipsCodeEmitter.cpp that expand unaligned loads/stores are dead
code. Removing it.

Patch by Petar Jovanovic.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169174 91177308-0d34-0410-b5e6-96231b3b80d8
minor renaming, documentation and cleanups.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169175 91177308-0d34-0410-b5e6-96231b3b80d8
Minor tweaking to SmallVector static size.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169176 91177308-0d34-0410-b5e6-96231b3b80d8
Classic JIT is still being supported by MIPS, along with MCJIT.
This change adds endian-awareness to MipsJITInfo and emitWordLE in
MipsCodeEmitter has become emitWord now to support both endianness.

Patch by Petar Jovanovic.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169177 91177308-0d34-0410-b5e6-96231b3b80d8
Runtime dynamic linker for MCJIT should support MIPS BigEndian architecture.
This small change adds support for that. It will make all MCJIT tests pass
in make-check on BigEndian platforms.

Patch by Petar Jovanovic.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169178 91177308-0d34-0410-b5e6-96231b3b80d8
Add VirtRegMap::hasKnownPreference().

Virtual registers with a known preferred register are prioritized by
RAGreedy. This function makes the condition explicit without depending
on getRegAllocPref().

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169179 91177308-0d34-0410-b5e6-96231b3b80d8
let moebot hear douban movie and books
Starting v0.4.0 development on branch, for pg.
Removes snprintf

This is actually faster anyway.
Merge pull request #95 from pyrated/master

Removes snprintf 
Adds equality operator
Merge pull request #97 from pyrated/master

Adds equality operator
Adds several binary operators:
divide, greater, greater equal, less, less equal, minus, multiply,
not equal
Merge branch 'master' of github.com:hkl/hkl

Conflicts:
	src/Makefile.am
	src/hklr_expression.c
	src/y.tab.y
Merge pull request #98 from dasmoose/master

Adds bunches of binary operators 
Adds if and while statements
Merge remote-tracking branch 'upstream/master'
Merge pull request #99 from pyrated/master

Adds if and while statements
Adds broken array expression and 99bottles example
Disables ELSE statement temporarily
Fixed bug in the deque class when using new_sized
HKL-40

Issue was fixed so that back is set to the last
element instead of 0. Just a bug in the intit
process. Now fixed.
Merge pull request #101 from thebearbear/master

Deque create n size arrays fixed
Fixed incorrect bug fix in deque
Merge pull request #102 from thebearbear/master

Done fucked up last commit - fixed
Changes variables back to list form
Merge remote-tracking branch 'upstream/master'
Fixes some memory leaks in hklr
Modifies hkl to do just-in-time object creation.
adding more files for new layout
FIX: Error handling
HUE-635 Porting to Bootstrap 2
HUE-647 changed my home link and breadcrumbs
Various fixes: HUE-657, HUE-650, HUE-649, HUE-646, HUE-645, HUE-652, HUE-642 and HUE-643
Improved 'well' spacing and remove Clear button from filter
HUE-765 [admin] User Admin app Internationalization

Updated message bundles
removed hello world app
[SDK] Header should dynamically link to installed apps
[SDK] Fix template header
[frontend] Show app icons in header

* added ICON setting to app settings files
* added tooltips to the icon header links
[frontend] Allow customization of app ordering in the nav bar

Added a MENU_INDEX property to the app settings py file for apps to specify
where they should appear in the top nav.
Add wiki app
[ui] Use the same common header on all error views
[ui] Only show icons in the navbar

* Apps that do not define icons are hidden.
* Clicking on the "Hue" brand shows the "About" app.
* Define icon for useradmin.
[ui] Convert common_header to mako

* Removed (now) unused templatetags
[css] Remove unused styles on top and bottom
HUE-654. [ui] Filebrowser "move" dialog could use a chooser
[jobbrowser] Make the default view be the job list
[core] Error views to handle non-ascii error messages

* Mako rendering should return a unicode string, so that its output
  can be safely included by another Mako template.
Set offline flag for a transfered wire
Correct calculation of maximum net size per rule
allow individual overwrites of generator templates
make autoloading working
Correctly check for the `assets/images/*` subfolders (see #4976)
Set `TL_ROOT` so the `constants.php` file can be included in Contao 2 (see #3)
codemirror codeeditor added
fixed for-loops
first runtime-based application compiles
runtime library seems to work in general
change lag0inds to lag0_index
beta-distributed mate pair choice, critical bugfixes
parameter tweaks: less mutations in children
more parameter tweaks
Close #75
Merge branch 'master' into doc-cabinet
[Bug 814949] Fix background image to be visible again [r=crdlc]
[Bug 820361] Update loading indicator in shortcuts loading screen [r=crdlc]
[Bug 820382] bugfix - helper cut text [r=crdlc]
Bug 817230 - Fix checkbox support for custom modal prompt.
[Bug 820328] Update clear button design and behavior to feel more native [r=crdlc]
Fixed scroll position in contact form show functions
[Bug 820333] Offline Apps tweaks [r=crdlc]
[Bug 820783] Smart Folder- fix space between apps and header [r=crdlc]
Bug 821440 - Set mozapptype=homescreen on the homescreen frame so it's less likely to be killed when we're running low on memory.
Bug 820145 - Edit icon -> text
Bug 822968 - [CONTACTS][FACEBOOK] Company name is not updated in contacts list until you enter in contact details [r=jmcanterafonseca]
Bug 818465 - [Call log] [BB] Apply list BB (r=basiclines).
Merge pull request #7054 from jlebar/homescreen-priority-821440

Bug 821440 - Set mozapptype=homescreen on the homescreen frame, r=timdream, b=blocking-basecamp
Bug 821852 - Make disposition of new contact creation inline,
    r=timdream, a=blocking-basecamp
Merge pull request #7097 from alivedise/bugzilla/821852

Bug 821852 - Make disposition of new contact creation inline
Bug 822626 - Fix l10n id on html button but not on the span
Merge pull request #7082 from KevinGrandon/bug_820145_edit_icon

Bug 820145 - Edit icon -> text
Merge pull request #6953 from ochameau/fix-modal-checkbox@817230

Bug 817230 - Fix checkbox support for custom modal prompt. r=alive
Bug 822466 - Change the timing calling focus
Bug 822164 - Enable proximity sensor only till the call is connected
Implemented the shader parser. It finds the uniform and attribute variables now. Still need to store and then figure how to generate the class files.
Revert "add d"

This reverts commit 22c8d5ae0b0d513da20cd3a4d3c636058a0b2997.
Clean in library Makefile does not remove the library itself

Signed-off-by: Cestmir Houska <czestmyr@gmail.com>
Remove chunk verification, for now

At some point, it will be important to be able to verify the SHA1
hashes of the backup data, such as when restoring.  When showing
information about the backups, this is less useful.
Escaping system

Since, huge news, the system is now message-based, we need an abstraction
layer which makes message delimitation.

It works pretty well!
rsyslog: Use different protocol for remote logging

The protocol23 format has some problems and, since most syslog messages
are submitted using the traditional protocol anyway, no real advantages.

See also http://bugzilla.adiscon.com/show_bug.cgi?id=125
dovecot: Add initscript

This script is added since it contains a bug which we'll fix next.
dovecot: Start after nslcd

This prevents dovecot failing to start because the virtual-mail user
from LDAP is not available yet.
nslcd: Add default initscript
nslcd: Start after avahi

Since we use avahi to locate the ldap server, this should guarantee
nslcd can actually reach it during startup.
Merge branch 'template' of github.com:daenney/Tika into mail
system: Add default inittab

This is the inittab as generated by the lxc-create script at some point
in the past.
system: Let init handle SIGINT and SIGPWR

This allows the container to be shutdown from the host using the
lxc-shutdown command.
sshd: Add default configuration
sshd: Disable PermitRootLogin
apt: Remove squeeze from sources.list

This prepares for upgrading to wheezy.
apt: Add sid to sources.list
dpkg: Don't touch /etc/skel

This directory is bindmounted (read-only) from the host, so don't let
dpkg touch it (or error out trying to touch it).
apt: Set Default-Release to wheezy
Upgrade configs to wheezy

This merges existing changes to the nslcd init script.

Colour prompts for bash are no longer enabled in bash.bashrc, but
instead in skel/.bashrc.
dpkg: Ignore bash-completion's profile.d file
Merge branch 'template' of git://github.com/daenney/Tika into mail
apt: Add contrib and non-free to sources.list
Merge branch 'template' of git://github.com/daenney/Tika into mail
16 color terminal vim dark solarized
Реализован метод get_count класса \DMF\Core\Model\Model, возвращающий число записей, удовлетворяющих условию.
Add: compiling option to disable DLL;
Add: a minor improvement to support compiling modules into the executable;
Add: modules/syslib/example.dao, example to compile scripts and modules into the executable;
bugfix: debug printout in browse
Basic sample started

Show both Conventional Controller ie based on Http Verbs.
As well as Custom controller, map Verbs to action names.
Slides, with annotations redone, titles
add if and some expressions like and, or, eq, ... .
dangerosity++
выкладка проекта на github
Ckeditor pre
Removed Ckeditor files
Merge branch 'master' of github.com:dioms/onvard
Testing out fugitive.vim
Stuff
Fixed Sort by Dates
in Process of changing index pg
Switched from prototype to jquery
Merging
Merge branch 'master' of github.com:dioms/onvard
Outlined Index pg
ST2 has decided to format it's own settings. Alright then.
CUtils: backtrace and panic functions for error handling
 - backtrace: only x86 (32bits) implementation for now
 - panic:     prints an error message and stack trace, then halts
 - assert:    modified to use panic()
Merge pull request #2 from gmorin/master

Debug: Backtrace and Panic functions
Fix tagbar not disabling for older vim versions.
Updating to latest versions of plugins.
Merge branch 'master' of github.com:dkinzer/.vim
write out a r snipit
Clouds printing.
Moving clouds
Speed adjustment with -/+ keys.
Collisions work.
Working demo.
rails g spec:install
Set test generator to rspec explicitly
capybara for integration test
jasmine for javascript test
dump schema for test
travis
continue prototyping
oops, forgot to save a file
Add submodules Doctrine Migrations
Add professor-provided sql script.
filled out gopher and added get_followers
[HttpFoundation][Session] Cleaned up constructor invokation
download zend library
tweaking, tweaking, tweaking
Bug fixes -- switchImage() & Play card arragement
Updated 50102-hw09.md
PHPでUTF-8の文字列の一定幅区切りの処理
Default button color for 'Send' in post-note
Reload inbox when going to /
Validate continue parameter for login
Expand feeds for lists when retrieving
Show count of members for each list in list-menu
Route handling (so far, only populated with the direct route)
Random route variations
Bombers' chosen routes now attempt to avoid flak
Remove redundant SQL queries

load_and_authorize resource was not using the overridden `collection`
method resulting in multiple SQL queries. As a result it wasn't possible
to correctly set the `@receipts` instance variable.
Use ActiveRecord::Relation#to_a to determine size

`ActiveRecord::Relation#size` runs an additional SQL query that returns
equivalent results as `#to_a.size`
Check for request.env['REMOTE_USER'] first

Results in a useless SQL query finding users where email is NULL.
Added disconnection logic.
Added functions enable/disable_console_error.
disabled console.error before bootstrap to forbid drivers and 3er modules to mix messages with ours.
using O0 for debug and O2 for release
Refining the refined_message method to not fail
added vim-foreplay
Some fixes to README.md
- Allow newer versions of libboost-python as dependancy
- Update version number to 0.22, as last published by Dan
Explicitly convert monitor_telnet_base_port must to int before we use it
updated title of ugly index
I dunno lol.
Consolidating mobile styles and adding style to the registration form.
Add `isLoaded` flag for ManyArray

This commit refactors the internals to make it
easier to know when all records belonging to a
ManyArray have finished loading.

Now, the store keeps a map of all clientIds that
are being loaded and are members of a ManyArray.

Also, the ManyArray state manager has a new
initial `loading` state that it exits when all
of its clientIds are loaded into the store.
Add transactional IO to Base64/Hex Encoder/Decoder
changed outlier threshold to 3.0
Version Upgrade to 0.1.1
CodeEditor: inEvent should be an object
Ui.Carouselable : fix a minor issue with keyboard

-On next and previous, if the carouselable was already at le first or
the last position, using keyboard to navigate added a "new step", so to
go farward or backward user had to hit the arrow key two times.
-Core.FilePostUploader : add responseText to the error event
Merge branch 'develop' of github.com:erasme/erajs into develop
bug fix index out of bound CustomHash
property add Document Type
cleanup python to_dictionary
Merge pull request #62 from webitup/master

Add property Document to store nested values
all unexpected errors fixed
Running samples in Killa for android
- fixed Killa script loading on android targets
- exporting finish() method in CCDirector for script exit
- changed the Tetris sample in order to run in non OpenGLES 2 devices
Eliminadas cosas de mas
Merge branch 'master' of github.com:faloi/tegece

Conflicts:
	AlumnoEjemplos/RestrictedGL/Tank/Tank.cs
init
Merge branch 'master' of github.com:faviocj/skzf
init
new file:   .settings/org.eclipse.jdt.core.prefs
	new file:   InPUT4j_Injection/.classpath
	new file:   InPUT4j_Injection/.project
	new file:   InPUT4j_Injection/.settings/org.eclipse.jdt.core.prefs
	new file:   InPUT4j_Injection/bin/se/miun/itm/input/annotation/Get.class
	new file:   InPUT4j_Injection/bin/se/miun/itm/input/annotation/Input.class
	new file:   InPUT4j_Injection/bin/se/miun/itm/input/annotation/Output.class
	new file:   InPUT4j_Injection/bin/se/miun/itm/input/annotation/Set.class
	new file:   InPUT4j_Injection/bin/se/miun/itm/input/injection/Injection.class
	new file:   InPUT4j_Injection/bin/se/miun/itm/input/injection/OtherInjection.class
	new file:   InPUT4j_Injection/src/se/miun/itm/input/annotation/Get.java
new file:   InPUT4j_Injection/src/se/miun/itm/input/annotation/Input.java
	new file:   InPUT4j_Injection/src/se/miun/itm/input/annotation/Output.java
	new file:   InPUT4j_Injection/src/se/miun/itm/input/annotation/Set.java
	new file:   InPUT4j_Injection/src/se/miun/itm/input/injection/Injection.aj
	new file:   InPUT4j_Injection/src/se/miun/itm/input/injection/OtherInjection.aj
	new file:   InPUT4j_Test
	modified:   InPUT4j_Test
添加登录注销功能
set a documentation_url in __init__, use it a log message; clean

Use official url for documentation. w/ computed version no, not 'notmyidea'.

The version of pelican is used to build the final url.  This may require that
the version number is bumped accordingly in dev branches, and I am not sure this
is a good idea (but it's mine ;)

While at it, in settings.py: reword warnings, cut long lines, reindent (flake8)
Use stripext from main library in meal ex.
Release 0.3.0
Added <leader>. as NerdTree toggle.
Merge pull request #11 from flames/master

Fixed #499: When deleting a domain alias, the custom DNS records (including those related to external mail server(s)) should be deleted
fixed wrong quota edit link (ticket 500)
Fix compilation when QT_STRICT_ITERATORS is defined.

Patch provided by David Faure.