labofsahil/github-event-dataset-2012 huggingface dataset:
Fix place where couch conflicts could block request completion.
send emaild and search in cr mgmt
ClientGui podzielony logicznie na ramki 
błędy sa w CreateUserForm3 i poprawie to jutro nie dotykać
Add Some Hello World Demos.
implementing Date.prototype.getUTCSeconds()
implementing Date.prototype.getUTCMinutes()
implementing Date.prototype.getUTCHours()
implementing Date.prototype.getUTCDay()
implementing Date.prototype.getUTCMonth()
implementing Date.prototype.getUTCFullYear()
Some errors in knn fixed, some remained
removed unused combinator
Improvements in the glow implementation.
clarifying comment
Merge pull request #85 from elaird/secondary-calcs-improvements

Secondary calcs improvements
Después de importar.
Add endea.test
Datastore backend: Google and Berkeley
Add Start/Stop Discovery and Enable/Disable Visibility functions, still WIP
updated distro config for latest demo updates
this line was not supposed to be removed. restore it.
sync master
update datepicker api
Merge branch 'gh-pages-source' of https://github.com/etaoux/brix into gh-pages-source
Merge pull request #27 from DQNEO/feature/bugfix-_getMemcacheInfo

Fix: balancing multiple servers by cache_key not work
ECMS-3755 fix the home.xml node, removing mix:lockable of this node, also in LockUtil.updateLockCache() method, check if node is locked when get Lock object from Nod object
Change the version of org.gatein.wci.version to 2.2.0-Beta02
PLF-3971 : upgrade parent pom to 9-SNAPSHOT
PLF-3971 : change WAR dependencies to use the pom
Merge remote-tracking branch 'origin/master' into feature/kill-exobuild

Conflicts:
	pom.xml
gatein.common forced upgrade is unnecessary
Update doc/intro.rst

How to load Twig using Composer
merged branch loalf/patch-1 (PR #835)

Commits
-------

5c805a1 Update doc/intro.rst

Discussion
----------

Update doc/intro.rst

How to load Twig using Composer
fixed typo
jackhost: clean exit on SIGTERM and SIGHUP
This commit fixes jack xruns on quit from ladish but
these signals are not specific to ladish.
Implement subgraph line modes for DSSI/External UI
Disable wavetable plugin even is --enable-experimental is set
utilisation simple_form
Fixing the accidentally bad instructions on how to add/commit a file
Merge pull request #5 from felixc/fix-git-instructions

Fixing the accidentally bad instructions on how to add/commit a file
Check to see if `f` is a null value before trying to reference
any properties on it.
Pass any query params along with the route during a popState event.
Cleanup code

Tidied up code
Added CORS headers
Tidying up code

Tidied code.
Using xhr and post instead of jsonp for requests in the body.
Improved authentication handling
Streaming support using EventSource
Tidying up code
Fixed error in pico.get when no callback is passed
Fixed an issue with urlencoding of parameters
Fixed url property of exceptions

Url is relative instead of absolute as the previous method of
determining the absolute url gives the wrong url with xhr requests
Made xhr object a local variable

This was causing a "INVALID_STATE_ERR: DOM Exception 11"
Add client.py

Added a python pico client
- load remote modules and interact with them through pico
Fixed bug with streaming functions
Updated readme
fixed bug with url encoding for streaming functions
Fixed bug loading modules when run as python -m pico.server
[actuators] rename Target to WpIndicator
* if this object exists, it will be set to the waypoint position and heading
to visualize where the wp is
* This object needs to have NO_COLLISION set
modificatino desgin
brcm47xx: revert r33935: check for .ELF header in partition parser

For sysupgrade the generic image should be used and the special image for the wgt634u is just needed for initial flashing over CFE.
russell reported that with this patch sysupgrdae did not worked for him any more and he could not reproduce the error described in #11420.
With the patch the linux partition also contained the loader which is in the first 128KB.


git-svn-id: svn://svn.openwrt.org/openwrt@34201 3c298f89-4303-0410-b956-a3cf2f4a3e73
step 2
refactor
fixed #3460 Page results for groups


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@18228 35612d4c-9d10-0410-837c-bf9dd1be60d7
Removed print statements used for debugging.
Separate javadoc aggregate and parent assembly to another profile
Integers to Romans Numerals & Fibonacci sequence generator
Allow Search URLs to be specified in the options.
fixing up the tests
Making the Alias class multi-url capable.
Making the scan class multi-url aware.
Making the Index class multi-url aware
version bump
Merge pull request #1 from github/multi-url-aware

Multi-URL Aware
checkout: print a message when switching unborn branches

When we switch to a new branch using checkout, we usually output a
message indicating what happened. However, when we switch from an unborn
branch to a new branch, we do not print anything, which may leave the
user wondering what happened.

The reason is that the unborn branch is a special case (see abe1998),
and does not follow the usual switch_branches code path. Let's add a
similar informational message to the special case to match the usual
code path.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jk/checkout-out-of-unborn' into pu

* jk/checkout-out-of-unborn:
  checkout: print a message when switching unborn branches
usage.c: detect recursion in die routines and bail out immediately

It is theoretically possible for a die handler to get into a state of
infinite recursion.  For example, if a die handler called another function
which itself called die().  Let's at least detect this situation, inform the
user, and call exit.

Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'bc/do-not-recurse-in-die' into pu

* bc/do-not-recurse-in-die:
  usage.c: detect recursion in die routines and bail out immediately
Unify appending signoff in format-patch, commit and sequencer

There are two implementations of append_signoff in log-tree.c and
sequencer.c, which do more or less the same thing. This patch

 - teaches sequencer.c's append_signoff() not to append the signoff if
   it's already there but not at the bottom

 - removes log-tree.c's

 - make sure "Signed-off-by: foo" in the middle of a line is not
   counted as a sign off

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'nd/unify-appending-of-s-o-b' into pu

* nd/unify-appending-of-s-o-b:
  Unify appending signoff in format-patch, commit and sequencer

Conflicts:
	log-tree.c
config: don't segfault when given --path with a missing value

When given a variable without a value, such as '[section] var' and
asking git-config to treat it as a path, git_config_pathname returns
an error and doesn't modify its output parameter. show_config assumes
that the call is always successful and sets a variable to indicate
that vptr should be freed. In case of an error however, trying to do
this will cause the program to be killed, as it's pointing to memory
in the stack.

Detect the error and return immediately to avoid freeing or accessing
the uninitialed memory in the stack.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'cn/config-missing-path' into pu

* cn/config-missing-path:
  config: don't segfault when given --path with a missing value
Fixed a doc to not end mid sentence
vars have been added
Use npm root command to locate the example SDF
AC_SUBST SYS and plugin_sfx, used under Darwin for yorick/stdplug
Rewrite bundles script in python.
Add easymotion plugin.
Moved old files to backup, fixed typos in curves_by_height.sage.
Clarifying distinction between symk and dist.
Make double scrollbar arrows default to false again.
Appearance preflet: Add a double scrollbar arrows setting.

Rename the 'Decorators' tab to 'Look and feel'.

Fixes #8926.
Rename DecorSettingsView to LookAndFeelSettingsView.
Fixed pair of typos in hgrep script.
Tracker: Tracker crashes in KeyDown() if there are no models associated with the PoseView.

Happens in special windows, such as OpenWith Window, that do have a PoseView not associated
with a model.  Fixes #8160.
Tracker: fix memory leak in OpenWithFilter. (CID #715684)
Tracker: Prevent TextWidget to start editing twice

It was possible to confuse TextWidget to start editing twice (clicking on the widget and during the wait,
pressing F2) and confusing the states of the TextWidget.
I don't really use ShowFunc, and it errors more often than not
Almost finished mysql2csv
Upload works... needs more validations though
GameObjectFactory added for client::view and client::model
Add pow_uint function
bashrc: yellow color when on WMF labs :-)
Added basic screens including splash screen, mainmenu, credits, and routed all in-game level.
modified javascript ckeditor files
added cucumber features and scenario for part 1
added docs for models and controllers
merge modification for book
main.tex for *.tex
Add link to bigger map. #84
Start using Twitter Bootstrap
[mms] Collapse multiple mailbox export options in dynamic mailbox view to single action.
[mms] Show non-javascript enhanced login screen for non-smartmobile mobile browsers (Bug #11215).
#113 Added blockchains test IP to get validation pass
modified:   macros_c/types.def
Fix type_include
	modified:   macros_c/types.def
Merge branch 'master' of github.com:hzhou/MyDef

Conflicts:
	macros_c/types.def

 Changes to be committed:

	modified:   README
	new file:   bootstrap.sh
	modified:   cmp/lib/MyDef/output_perl.pm
	modified:   compileutil.def
	modified:   deflib/std_c.def
	modified:   deflib/std_php.def
	modified:   deflib/std_win32.def
	modified:   docs/mydef.vim
	modified:   macros_c/cfunctions.def
	modified:   macros_c/dump.def
	modified:   macros_c/functions.def
	deleted:    macros_c/globals.def
	modified:   macros_c/hash_and_list.def
	modified:   macros_c/parsing.def
	modified:   macros_c/regex.def
	modified:   macros_c/structure.def
	modified:   macros_c/types.def
	modified:   mydef.def
	modified:   mydef_make.def
	modified:   mydef_page.def
	modified:   output.def
	modified:   output_apple.def
	modified:   output_c.def
	modified:   output_general.def
	modified:   output_php.def
	modified:   output_win32.def
	modified:   output_xs.def
	modified:   parseutil.def
	modified:   tests/c_structures.def
	modified:   tests/php_test.def
	modified:   tests/test.pl
Merge branch 'master' of github.com:hzhou/MyDef
Merge branch 'master' of github.com:hzhou/MyDef
Merge branch 'master' of github.com:hzhou/MyDef
Added $cur_line $cur_file
	modified:   compileutil.def
	modified:   output_xs.def
	modified:   parseutil.def
initial
Merge branch 'master' of github.com:hzlf/mf2012

Conflicts:
	.gitignore
* ElGamal/AES/SessionTag:
  - Increase TX expire from 10 to 12 min, while keeping RX expire at 15 min.
    3 minutes should be plenty of clock skew + delay.
  - Move tags-to-send and low-threshold values to be per-SKM
  - New session config options crypto.tagsToSend and crypto.lowTagThreshold
  - Prep for per-packet override of tags and thresholds
  - Cleanups and Javadocs
* I2PTunnel: Add some defaults for the new session config options
* OCMOSJ:
  - Don't bundle LeaseSet just because we're requesting an ACK
  - Changed session config option shouldBundleReplyInfo to default to true
    and be used to disable bundling altogether when set to false.
    Was previously an undocumented option to force bundling with a certain probability.
  - Don't send tags unless we've already generated a reply token (race)
  - Cleanups and Javadocs
* GarlicMessage:
  - Put data clove last to speed acks and leaseset store on far end
  - Change release target
  - Javadocs and cleanups
propagate from branch 'i2p.i2p' (head db152f1a9e08e80c7bd3b87735b51800e8f4c46f)
            to branch 'i2p.i2p.zzz.test' (head 5fd7a423338073ff81f5118cde74317b567846a6)
move DecayingBloomFilter, DecayingHashSet, and xlattice filters from core to router
move default properties from build.xml to build.properties
javadoc
comment out tests
Fixed an i2ptunnel button regression in the dark console theme
Updated history and bumped build number
Fixed icon column width being too large in snark filemanager
Fixed a bug in a console_big.css override in light and dark themes
"11th hour" de & es translation updates from TX
merge of '00209f1054786667de66adbd6038fccf8825260f'
     and '180794b6e2aad94450e102b4ac346f8172811ba1'
fixes after review
0.9.1
merge of '3347c631d86a2ccf634321b74e24b9a58e490a15'
     and '95d885a94cdde7ad40bbef11ec76f86d1ea7b798'
line ending fixes

These CSS files improperly contain a mixture of Windows *and* UNIX line
endings. Some lines had ^M after them but most didn't.
propagate from branch 'i2p.i2p.zzz.test' (head 5474e1a513fc8144a3d855e9c85d8b235f7f9816)
            to branch 'i2p.i2p' (head 5932d3923108572b22a8a7a600f0f9e62ecac347)
 * RoutingKeyGenerator: Cleanups (ticket #672)
fix cc height 100% in bb
Added shortcut icon.
Added assets structure.
fixed nats_server issue
Admin CSS tweaks
bundle update
Changed config to run on aws
Tidy
Tika extraction
Some fixes
Documentation
Don't always append global/default headers

Invokations of `global` or `default` methods with bare blocks (that is,
without option declarations) appends to the `helps` local variable
unwanted information, which results in this:

  % my_cli_app --help
    Global options

    Other options
  %

Fix it by checking whether global or default options, actually, have any
options defined.

Signed-off-by: Kyrylo Silin <kyrylosilin@gmail.com>
Merge pull request #97 from kyrylo/help-output-fix

Don't always append global/default headers
Not using stupid generated relations anymore
cascading0: Sample code for cascading 2
accumulo-ingest: start point.
Fix #3577 Un-break require('sys')
npm: Upgrade to 1.1.33

Support for parallel use of the cache folder
Retry on registry timeouts or network failures
Reduce 'engines' failures to a warning
Use new zsh completion if aviailable
uv: upgrade to 5b8a112
lint
homepage: Update Claudio's title/link
blog css: Styling of nested lists
blog: Don't print 'undefined' for missing author/category
blog: Direct bugs/feature feedback to issues
blog: Require posts to have a date
2012.06.29, Version 0.8.1 (stable)

* V8: upgrade to v3.11.10.12

* npm: upgrade to v1.1.33
  - Support for parallel use of the cache folder
  - Retry on registry timeouts or network failures (Trent Mick)
  - Reduce 'engines' failures to a warning
  - Use new zsh completion if aviailable (Jeremy Cantrell)

* Fix #3577 Un-break require('sys')

* util: speed up formatting of large arrays/objects (Ben Noordhuis)

* windows: make fs.realpath(Sync) work with UNC paths (Bert Belder)

* build: fix --shared-v8 option (Ben Noordhuis)

* doc: `detached` is a boolean (Andreas Madsen)

* build: use proper python interpreter (Ben Noordhuis)

* build: expand ~ in `./configure --prefix=~/a/b/c` (Ben Noordhuis)

* build: handle CC env var with spaces (Gabriel de Perthuis)

* build: fix V8 build when compiling with gcc 4.5 (Ben Noordhuis)

* build: fix --shared-v8 option (Ben Noordhuis)

* windows msi: Fix icon issue which caused huge file size (Bert Belder)

* unix: assume that dlopen() may clobber dlerror() (Ben Noordhuis)

* sunos: fix memory corruption bugs (Ben Noordhuis)

* windows: better (f)utimes and (f)stat (Bert Belder)
Merge branch 'v0.8.1-release' into v0.8
Blog post about 0.8.1
doc: fs.lchmod() is only available on OS X
deps: upgrade libuv to 3b8c0da
build: rename openssl configure switches

For consistency's sake, rename:

  --openssl-use-sys
  --openssl-includes
  --openssl-libpath

To:

  --shared-openssl
  --shared-openssl-includes
  --shared-openssl-libpath

And add --shared-openssl-libname while we're at it.

The old switches still work but `./configure --help` won't print them.

Fixes #3591.
build: handle output of localized gcc or clang

Before this commit, we used to scan the output of `$CC -v` for strings like
"gcc version x.y.z".

It was pointed out that this approach fails with localized versions of gcc
because those print (for example) "gcc versión x.y.z".

Use the output of `$CC --version` instead and only look at the first line.
doc: document setTimeout / setInterval behavior
deps: upgrade libuv to cc1b3de
build: detect cc version with -dumpversion

The heuristic introduced in f78ce08 ("build: handle output of localized gcc or
clang") does not handle "branded" versions of gcc, i.e. a gcc whose output has
been customized by the distro vendor.

Fixes #3601.
build: disable -fstrict-aliasing for any gcc < 4.6.0

It has been conclusively demonstrated that the -fstrict-aliasing bugs in gcc's
optimizer are not limited to the 4.5.x releases only.

Fixes #3601 among others.
Remplacer les composants FormItem de "tink" par HgGroupe/Vgroup

Close #276
separateurs
Merge branch 'master' of github.com:itkin/squid
vimeo
vimeo
Makefile: add Symbian-specific source and README files

* Makefile.am (EXTRA_DIST): Add Symbian C++ files from "extra" folder.
* Makefile.direct (OTHER_MAKEFILES): Likewise.
* Makefile.direct (DOC_FILES): Add Symbian README file.
* doc/doc.am (dist_pkgdata_DATA): Likewise.
Select GC_REGISTER_MAIN_STATIC_DATA behavior in build script (Symbian)

* build/s60v3/libgc.mmp (GC_DONT_REGISTER_MAIN_STATIC_DATA): Define
macro.
* misc.c (GC_REGISTER_MAIN_STATIC_DATA): Do not define specially for
SYMBIAN.
Merge branch 'symbian-port'
Update ChangeLog and AUTHORS files
Dummy merge branch 'iphone_libgc_6x'
WIP
lib: download: manager: removed 'alive pings'

They are not 100% reliable, and actually make debugging (if any) more
difficult.
lib: internal: graph: refactoring: removed unused method 'getReachableTo'
Merge branch 'next' into next-alt/natiresolver/autoremovals-in-dependencygraph
WIP
BUG: Associate package name with the date of the last commit. Fixes #1974

See http://www.na-mic.org/Bug/view.php?id=1974
BUG: LUT associated with label map were outdated causing regions to disappear when showing in visualizer

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20889 3bd1e089-480b-0410-8dfb-8563597acbee
add flog_source_url_path AsciiDoc attr
fix AsciiDoc modeline
ruby: basic stl::set<uint32> support, add Viewscreen.feed_keys
del textile
Added yellow.

Added yellow txt.
Removed attempt at unification
Added more filters
More work on templates and test
Minor fixes to template and queries
StartWindow constructor fix, update
Attempted fix for issue #190
Fix for WMI query.
uv: upgrade to 5b8a112
Added nvcc flag -use_fast_math to cmake file.
styled example area
Remove a few more working m17n excludes.
Disable tracing during env duping for JRUBY-6603.
version array should be an empty list in the case there is no YAML version
Merge pull request #147 from tenderlove/psych

version array should be an empty list in the case there is no YAML version
Add quick & dirty darwin FFI based io/console impl.  Incomplete.
Try to force CI to always run -server, which is more stable.
Preliminary version of fast indy-based global var access.
Make "if $global" free under indy.
Make "if CONST" free under indy.
Use indy + switchpoint for polling thread events.
Mangle variable names so $: doesn't interfere with : splitting.
Merge branch 'fastglobals'

Conflicts:
	src/org/jruby/runtime/invokedynamic/InvokeDynamicSupport.java
Tiny style update.
gauss_pdf function now requires appropriate numpy arrays forced conversion passes initial test
tested continuous sampling
add gx_pool_init_refc
Fixed typo, cpi > 1 should have been cpi > 0
PacketHeader 的 ts 算法
接上次提交
Container 现在会在 addChild 之后马上重新计算尺寸
Container 现在负责为 children 添加 resize 侦听
Component 的 fireResizeEvent 现在会检查上次广播事件时的尺寸，如果一样就不会广播
changes to td css -- centring
Разделил главный и локальные конфиги

Локальные настройки вносить в файл /protected/config/personal.php
!!!Сам файл внести в игнор список!!!
add 3d model view component
Prevent integer overflow of very large escape sequence params. Fixes #274.
Disable posterization and rely solely on TERM to tell remote end about colors

(should help #155 github issue)
t2: 1
t2: 2
t2: 3
Fix #2593
Merge pull request #2607 from kjkuan/develop

Fix the py renderer broken by the introduction of render pipes.
Switch missed `open()` calls to `salt.utils.fopen()`.
add missing imports
import absolute module
Merge pull request #2612 from bclermont/develop

Fix missing module
Merge branch 'develop' of github.com:saltstack/salt into develop
This module was previously removed.
Merge pull request #2614 from s0undt3ch/develop

Switch missed `open()` calls to `salt.utils.fopen()`.
Use actual time, to reduce `time.sleep()` inaccuracy.
Test for deprecation message first and then use the new `--out` format.
Minor cosmetic change.
Merge pull request #2617 from s0undt3ch/develop

Tests sync timer accuracy, cleanup, etc
Implement multiple package sources (zypper)

In addition, I have completed the Suse audit (#2436). Everything looks
OK, however I have only tested on OpenSUSE 12.2.

The below pastebins contain thorough results:

zypper.py module: http://pastebin.com/G2MCPR6Z
Suse grains: http://pastebin.com/Du03x50H
Merge pull request #2619 from archtaku/develop

Implement multiple package sources (zypper)
Fix issue #2592.

Added an extra, optional, 'tmplpath', keyword argument to template
functions and renderers. The argument should be provided to the
renderers as a hint when the source of a template is from a file.
Merge branch 'develop' of github.com:saltstack/salt into develop
Move functios related to files to package file
partner varchar 200
4.4.8
fixed up bad links
Use utcnow() instead of now()
Limit the number of reports a user can make
Display message when user tries to report a quote but isn't able
Add page for reported quotes etc
完成 _MSG_PLAYERLEVELUP
rake hee:check '10 dup *' '4 quote swap compose apply'
DO-24 api - ulozeni feedbacku - chybove stavy
Merge branch 'master' of github.com:krtek/obcan
fixed update_no_main scripts to insert optind = 0 line
added some timing output to verg
2012-6-21 9:56:37
n1n1
parse_cookie_string
setting and reading cookies
add signed session support
Changed voipvoice API functions to new format.
Implemented new voipvoice api functions.
Added mp3 files.
Merge branch 'master' of github.com:leoburd/pph
Merged  multibeam branch
Core functionality of simulation framework working
Fix an invalid index error using assertions with MSVC.
Cosmetic change: <time.h> to <ctime>
Link libOpenImageIO against psapi on Windows regardless of the compiler.
Fix test in MSVC due to wrong assumptions about the layout of std::string.
Misc.

  * Added DESCRIPTION, NAMESPACE tweaks
  * Lots of reworking of building the cache (ugh).
  * Cached* w/ range.strict=FALSE should not sett view bounds now
build: Fix APE tag dependencies
dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16
intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addresses
dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxU
fix: Remove PIN asking when card becomes 'ready'

When cardState changes from 'pin_required' to 'ready', the dialog did
not disappeared, hence blocking the whole interface. With this change,
we now handle this case. It can happen if rild crashes.
Added PERCENT-ENCODE.

A new encoder of percent-encoding.
send rsync output to /dev/null
fix stdout and stderr for webserver backup scripts
fix log redirection
always add mysqldump info
fix log name type
remove backupninja, use duplicity
fix duplicity sintax
more log lines
fix log redirection on cron entry
change log redirection, &>> didn't work
remove backupninja stuff
adjust remotebackup nagios check freshness
always use 24h format on log
Absolute reference for image url in assertion
Added tip on including an 'id' field in HABTM-join tables if developer plans to use their associated Model classes to generate fixtures in the test database.
Providing a .rb extension when open plan for editing, that way the EDITOR can
syntax highlight it.
fixed ie bug
Merge branch 'master' of github.com:lugir/lanpu
Add Crossfilter-like brush handles.
Added PlansController.
fix tests according to the new membership API
Récupération de la date de sortie des élèves qui ne sont plus dans une classe dans SIECLE
Récupération de la date de sortie des élèves qui ne sont plus dans une classe dans SIECLE
Correction Regis:
Récupération de la date de sortie des élèves qui ne sont plus dans une
classe dans SIECLE
Correction sur l'affichage des notices.
Merge branch 'release-1.6.1'
Correctif sur l'affichage des notices générales.
Correction import photos avec fichier correction noms
Ajout d'un test pour ne bien retourner que les témoins d'appel. Ajout d'indications d'id_groupe en attribut title.
Merge branch 'release-1.6.0' into release-1.6.1
Merge branch 'release-1.6.1'

Conflicts:
	responsables/maj_import3.php
Correctif sur le nom de salle affiché.
Correctif: Ré-initialisation des dates de clotures de périodes de notes lors de l'initialisation.
Correctif sur la modification du mode d'accès resp aux appréciations.
Merge branch 'release-1.6.0' into release-1.6.1

Conflicts:
	gestion/param_gen.php
Correctif js.
Merge branch 'release-1.6.0' into release-1.6.1

Conflicts:
	gestion/param_gen.php
Merge branch 'release-1.6.1'

Conflicts:
	gestion/changement_d_annee.php
Modification de variables.
Retouche de présentation des notes de bas de page.
Correction d'un bug d'affichage.
Make sure we use the width of the right tag.
Subo cambios para el run books, no esta funcionando bien el parseo de el Slave.
Fix `make distcheck`
`make distcheck` when building with Travis
remove properties from auth response
remove TermRef component
Add i18n to stop ActiveSupport from complaining
Add global terms
Add test_scope_finished() to WorkPlanTest

app/models/work_plan.rb
- (comments)
test/fixtures/work_plan.yml
- Add new entries.
test/unit/work_plan_test.rb
- Add test_scope_finished().
- Modify test_has_many_task_plans() to test for
  TaskPlan#work_plan as well.
[newline_to_br.rb] Newly created

utilities/newline_to_br.rb
- Newly created.
Changed an ampersand in the xml to a &amp;
still one error.
[conky] Font adjusted
Changes that should've been done in the initial commit
Scalacheck groupId has changed https://github.com/rickynils/scalacheck/issues/24. Necessary to build with scalaVersion 2.9.2. Works with 2.9.1 too.
Added a unit test for local-cluster mode and simplified some of the code involved in that
add sleep for the inspector thread (cmd line parameter)
Merge pull request #31 from tbarbugli/sleep

put the inspector to sleep
change position of input fields for attributes / simplify templates
updat evariables template to include no-namespace-schema-location variable
Fix another bad reference when finding membership of receiver
Los pastores a Belén corren presurosos, llevan de tanto correr los zapatos rotos
Added doc for htmlib
GSM 7bit encoding support
bump version
handle xmlrpclib client errors reported through exceptions

Signed-off-by: Jakub Filak <jfilak@redhat.com>
command line argument that allows user to assign him to a new ticket

Signed-off-by: Jakub Filak <jfilak@redhat.com>
Merge pull request #1 from jfilak/master

small improvements
Birth!
add auxiliary data pointer to mrb_state
Merge pull request #250 from MobiRuby/add_ud_to_mrb_state

add auxiliary data pointer to mrb_state
Simplify. Should not use strlen() as possible. It needs complexity.
Merge pull request #300 from monaka/pr-simplify-codegen

Simplify. Should not use strlen() as possible. It needs complexity.
temporal VC patch from nkshigeru
Fix temporary disabling of hmac verification
libssh2: Remove unnecessary build script-related files
Documentation update.
Documentation update.
Merge branch 'master' of https://github.com/msi88/Popya.git
Documentation and presentation update.
Merge branch 'master' of https://github.com/msi88/Popya
comit1
comit1
comit3
test comit
Syphilis Keyword Handler
Merge branch 'syphillis-test' into dray-dev
Merge branch 'dray-dev' of github.com:mwana/mwana into dray-dev
Fix issue 8637

Compiler can and should deduce purity of templates
Merge pull request #783 from blackwhale/depure-enforce

Let enforce rely on deduced purity & safety
Add section for 2.061 to changelog.
Auto-generated dumps and diffs for 0.9.118-1
Added missing "this" to GetControlPanelState
Merge branch 'master' of github.com:n2cms/n2cms
Adding master only file
key_commit: added some clarion clock functions
fix json-parser - parser5.scm
comment noting location of usps sample numbers
Logs failure to connect as debug as it's not really an error, but rather nice to know for error tracking
The yes(1) utility is not part of SUSv3, do not reference it in manual pages.
timesheet updates, show total hours, show other users timesheets
add priority to tasks list
Added security and updated import.sql.
works on redis and we have user groups
modified the README.md
CoNLL-X Portuguese example
수정 3
added links to users#new in layouts.
BUG: fix download link in setup.py (which is shown on PyPi).

Closes Trac ticket 2243.
Fix stats name, Vulnerability 1st cut of Photos (now need thumbnails) & reuse some more vdata if we already have it cached
Started marketplace package for SAMAR
Converted captcha image to base64.
repl: header

Signed-off-by: Felix C. Stegerman <flx@obfusk.net>
filtres part2
icode beta 0.1
Formatted the advanced search page.
move cost typedef to edge header
book: more of Chris comments
TK clear ups
removed unnecessary source hannah added
applications edits after TV commits round 2
gitignore to ignore winedt files
applications-csmr draft done
applications-csmr caption edit, still needs work
applications-double_dismod TV edits, more to come
added new store to store list
store list is now sorted
sds:key value data structure
refs #3227 some more tests

git-svn-id: http://dev.piwik.org/svn/trunk@6503 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Doc

git-svn-id: http://dev.piwik.org/svn/trunk@6372 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Refs #2473 TODO:  Instead of hardcoding 6 we should put the actual number of hours between 2 archiving runs

git-svn-id: http://dev.piwik.org/svn/trunk@6924 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Function name collision makes pkg-static fails.

Rename sha256_file to hash_file().
Fix handle_rc_script during upgrade
Add a +CONTENTS emitter
Small man-page fixup
모든 소스가 수정된것처럼 나오네

윈도우에서 올린걸 맥에서 싱크해보니
Add documentation for encode_html
Merge pull request #307 from 2shortplanks/master

Document encode_html
Issue #482 search raises exception.

Handle pypi results for packages with no ordering.

TESTED=2.4.6 2.7.1 3.2.2
Merge pull request #488 from pnasrat/482-no-ordering

Issue #482 search raises exception.
if there is a git repo without an origin, then don't fall over. cf. issue #58
more compatible exception handlying format from @carljm
oops forgot an import
refactor. move the exception handlying back to the caller, rather than rely on it
Fixed #487 - don't check for best-version-already-installed with explicit-URL requirements when upgrading.
Fixed a test that was failing intermittently due to pyc file race conditions.
Add a __main__.py to enable 'python -m pip' on Python 2.7+. Thanks Alexey Luchko.
Add news entry for __main__.py.
test
expect stderr
Preserve the query portion of URL-type InstallRequirement URLs.

With this patch, install commands like:

  pip install 'http://foo.com/?p=bar.git;a=snapshot;h=v0.3;sf=tgz'

will work as expected.
Add test_install_requirement.py to test URL-with-query parsing.
Remove outdated docs section on no-longer-useful PIP_VIRTUALENV_BASE environment variable.
Revert unneeded added imports.
Merge branch 'issue-58-origin-less-git' into develop
Update AUTHORS and changelog.
Added output checking to the no-origin test.
Note the removal of Python 2.4 support in the changelog.
add next meeting location
Moved base files to Base dir
Updated Base files
Updated
Fix AEvents
Updated APlugins
Updated AStrings
Updated ASystem
Updated AUi
Updated AUtils
Updated ARuntime
Updated
manifest doesnt have scss any longer -> now .css
Adicionado campo de duração de evento

Para maior precisão

Signed-off-by: Fernando Rocha <fernandogrd@yahoo.com.br>
adding external link to events. Allows to point to page of event hosted on other websites #6
automatic redirect to page given slug #6
Merge branch 'master' of github.com:pugpe/pugpe
Adicionado Procfile

Signed-off-by: Fernando Rocha <fernandogrd@yahoo.com.br>
Atualizado gunicorn

Signed-off-by: Fernando Rocha <fernandogrd@yahoo.com.br>
fixing fb like button
fixing fb like button
Merge branch 'external'

Signed-off-by: Fernando Rocha <fernandogrd@yahoo.com.br>

Conflicts:
	apps/events/models.py
some visual corrections for 2d model window
Updated cancan from 1.6.7 to 1.6.8 (refs #253)
Use class names, not constants
Merge pull request #353 from ifad/update-cancan-to-1-6-8

Update CanCan to 1.6.8
Upgrading mocha 0.11.2
Merge pull request #5956 from arunagw/mocha_upgrade

Upgrading to Mocha 0.11.2 to fix Object#method override
Improve secret_token deprecation message
Make Rails.public_path return a Pathname
Merge pull request #7825 from sikachu/master-rails-pathname

Make Rails.public_path return a Pathname
unshift html-scanner into $LOAD_PATH rather than append
Merge pull request #8337 from amatsuda/unshift_html_scanner

unshift html-scanner into $LOAD_PATH rather than append
small refactoring of build_relation in uniqueness

reflection init as 'if' stantment.
column is always the same expression and depends from the changing of attributes
Merge pull request #7791 from acapilleri/build_association

small refactoring of build_relation in uniqueness
Developer mode fixes.

* Quote style inspector output so it won't cause a crash if special
  characters are included.
* Fix a typo on the theme test screen.
(Fixes issue #743) doc typo
c&p error?
Merge pull request #748 from DaSourcerer/patch-1

c&p error?
Auth default roles (issue #742)
[Guide] Added topics.prado
fixes issue #618 caching of CWebUser::checkAccess

Fixed caching of CWebUser::checkAccess() when it is called first time
with and second time without $params
Merge pull request #751 from cebe/618-cwebuser-checkaccess-caching

fixes issue #618 caching of CWebUser::checkAccess()
Merge branch 'master' of git://github.com/yiisoft/yii into uk-doc
[Guide] Added topics.error, topics.logging, topics.webservice
CHtml::resolveValue() ignoring of attribute elements accessor at the begining of the $attribute argument now works properly.
Typo
Removed extra space
[Guide] Added topics.console, topics.i18n. Typos, fixes.
Merge pull request #754 from Borales/uk-doc

Completion of ukrainian guide section
Merge pull request #753 from resurtm/fix-chtml-resolve-value-bug

Bug: CHtml::resolveValue() ignoring of attribute elements accessor at the begining of the $attribute argument now works properly
Added unit tests for CHtml::button(), CHtml::htmlButton(), CHtml::submitButton(), CHtml::resetButton() and CHtml::linkButton().
Finalizando os counts dos Relatórios

Penultimo push da release
SessionCookie#remove(String) now returns the value it removes
posts in _posts/drafts will be marked as draft automatically. this makes them easier to .gitignore/etc
Implement try...catch...finally emission.
Build autocomplete.
removetags p to notes.html
Fixed StaffSystem issues and updated tests
Fixed attributes and added viewer example
[bug 804151] Mobile template for /questions
[bug 795890] Mobile template for question page
[Bug 816085] Add parameter to sign-up links from AAQ and m main registration page
set_custom_parameter fixed
Move authn request parsing integration tests into their own suite.
Authn response production integration tests.
Some sample data.
upgrade to amp 3.3.0
Fix file filtering on pre-Gingerbread devices

file:///home/roberto/tools/android-sdk-linux/docs/reference/java/lang/String.html#isEmpty()

...this method is from API level 9 onwards.
Drop support for obsolete Android v2.1 (Eclair) and target Jelly Bean

context.getExternalCacheDir() came in with Froyo.

http://developer.android.com/reference/android/content/Context.html#getExternalCacheDir()

Eclair is now on only a very small fraction of devices... terrifyingly
phone operators are _still_ selling Froyo.
State Variable Feedback Change

Computed the K controllability matrix.
Add floating point numbers.
RTC now works with the pthreads example. We use a wrapper function to conform to pthread_create specs while
also allowing struct params in the original function.
replace command-t with ctrl-p

ctrl-p does not require ruby which makes it much more stable
Fix bad placement of ctrlp
remove command-t mapping from gvimrc
setup custom mappings for ctrl-p
add buffer-explorer plugin
remove conque-term as I don't really use it
Build ICU in parallel on MacOS; it takes too long otherwise!
Add a few cute TODO's.
Fixed errors from running axess on itself.

1. Bad use of id in the form. Should have just used the predefined one.
2. textarea is a valid part of a form, that is not an input.
Slightly extended send functions. Cleaned up test_node example.
resync rmf
Remove the Plugin nature in the Scala compiler project file.
Recognize java enums as constants from source.

Fixed up one of the mismatches between how java source is modeled
and how java bytecode is modeled.  We should get the rest of them
too.  Closes SI-2764.
SI-6167 Override SeqLike#isEmpty for better performance

This results in a faster Vector#isEmpty (and head, tail, last, init)
because it avoids building a VectorIterator just to check if
iterator.hasNext is false.
Other classes which have not overridden the implementation of SeqLike
also benefit from it.
Merge pull request #1140 from soc/SI-6167

SI-6167 Override SeqLike#isEmpty for better performance
MAINT: sparse: refactor identity() into eye()

Makes also identity() return a dia_matrix by default. Closes #1767
MAINT: sparse: use eye() instead of identity() everywhere
Merge pull request #363 from pv/sparse-eye

MAINT: sparse: refactor identity() into eye()

Makes also identity() return a dia_matrix by default. Closes Trac #1767
Added sdsinfo.coffee
updated center.csv
Merge branch 'gh-pages' of github.com:sdslabs/jee into gh-pages
Added default gray scale color bar for color manipulation color file chooser.
Update excel analysis file to use remote csv sources
Clean  up dashboard

Only the first game is used
Add notes on working with excel
ics : add p1 and p1c devices, and their kernels
Fix runtime-path
Remove libgomp loading since Z3 4.0 doesn't have an issue with it any more
Add tip about mounting NetBSD partitions on Linux
Fixing a typo in FileUtils#ln_sf documentation

The `FileUtils#ln_sf` documentation indicates that calling it is the same as calling `ln_s(src, dest, :force)` which is wrong.

This commit fixes it by replacing `:force` with `:force => true`.
using pages for static messages, sending html emails
display number of results in associations search
assoc filtering for all items
filter counter also to soft, inv, contract assoc
when deleting items remove tag association
user filtering
y-drivetrain idlermount translate fixed. the parts start at same z level now
Fix mistake in plotlm6
fixing twitter url
auto pull note URLs from goodreads
Updated lightcurve example to include names
Allow to load interface files with compatible versions
Change: Reminder to format string.
more work on mx mult and cache blocking
Cleaned up ShipmentsController so that it's easier to test

In particular, see how clean auth/spec/controllers/admin/admin_shipments_controller_spec.rb is now
Correct specs inside auth that were mysteriously using wrong request methods

Also tidied up ShipmentsController spec inside of auth to remove the almost 20 lines of stubs
Revert has_role? change from @af9bf43b37797a19e8c4b473fa7cd7d86104249a, as it breaks role checking in auth specs.

Trung will look into a fix for it tonight, as per https://github.com/spree/spree/commit/af9bf43b37797a19e8c4b473fa7cd7d86104249a#commitcomment-1474220
Use correct controller action request methods in auth/admin_orders_controller_spec
A little refactoring
Fix server handling of index.html, added a few file checks.
newly release
fixes: edges not None, gi.random_edges
inlined function
added OptionValue, removed DecodeWithOptions
Update date in notification email
Expose PLSQLParser.canonicalName() as  helper method getCanonicalName() in SimpleNode
Correct logging message for StatementExpression equivalent inStatementAndBraceFinder
Correct off-by-one error when displaying code text )lines is zero-based so that it was displaying the next line- possibly what was intended)
Remove unused import from PLSQLDesigner (Interface ExecutableCode used instead)
Correct PLSQLDataNode to describe TypeMethod as a method
Remove System.err.println() from DFAPLSQLPanel
solve returns RootOf objects for polys of high degree.

In [1]: solve(x**5+x**4+x**2+4)
Out[1]:
[
      ⎛ 5    4    2       ⎞
RootOf⎝x  + x  + x  + 4, 0⎠,

      ⎛ 5    4    2       ⎞
RootOf⎝x  + x  + x  + 4, 1⎠,

      ⎛ 5    4    2       ⎞
RootOf⎝x  + x  + x  + 4, 2⎠,

      ⎛ 5    4    2       ⎞
RootOf⎝x  + x  + x  + 4, 3⎠,

      ⎛ 5    4    2       ⎞
RootOf⎝x  + x  + x  + 4, 4⎠]
Merge pull request #1358 from Krastanov/solve_roots

solve returns RootOf objects for polys of high degree.
shouldwork
Merge branch 'mattia'

Conflicts:
	UE4/src/java/tuwien/big/mensch/controller/GameControl.java
Nees pros8ikes
Mako-Includes innerhalb von templates/ zulassen und einfache Debug-Funktion mit Mako-HTML-Trace hinzugefügt
Clean up inspector setup
Inject history dependency in map
Convert History to module pattern

There is only ever one History, so memory use is not a
concern.
Move responsibility for dispatching change event to history
History#reset
Eliminate Map#{perform,undo,redo}

Map binds to history changes instead.
* タグ機能修正
actually use specified branch
ワークショップ用サンプル00作成
Release 0.1
Added repository url.
Added generic automata support
Correct indent usage example
'registry' command not working - ins not being passed
pages and layouts and a bunch of goodies
Replaced Storage with Session in titon\security\Auth
Added test cases for titon\libs\identifiers\http\BasicIdentifier
Added test cases for titon\libs\identifiers\http\DigestIdentifier
Added test cases for titon\security\Auth
ALSA: atmel/ac97c: correct the unexpected behavior when using uninitial value for reset pin

When pdata->reset_pin is passed with a negative value (means gpio
is invalid), then chip->reset_pin will not be assigned to a vaule,
it will use default value 0. This will cause unexpected behavior.

So, add this patch to correct.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'topic/misc' into for-next
ALSA: pcm - Optimize the call of snd_pcm_update_hw_ptr() in read/write loop

In the PCM read/write loop, the driver calls snd_pcm_update_hw_ptr()
at each time at the beginning of the loop.  Russell King reported that
this hogs CPU significantly.

The current code assumes that the pointer callback is very fast and
cheap, also not too much fine grained.  It's not true in all cases.
When the pointer advances short samples while the read/write copy has
been performed, the driver updates the hw_ptr and gets avail > 0
again.  Then it tries to read/write these small chunks.  This repeats
until the avail really gets to zero.

For avoiding this situation, a simple workaround is to call
snd_pcm_update_hw_ptr() only once at starting the loop, assuming that
the read/write copy is performed fast enough.  If the available count
becomes short, it goes to snd_pcm_wait_avail() anyway, and this
processes right.

Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'topic/misc' into for-next
ALSA: usb-audio: Fix comment

Explained by Takashi in <s5hfwbtmz0q.wl%tiwai@suse.de>

> The reason is because get_min_max*() isn't called in the place you
> created these controls, and get_min_max() would be called only for
> integer volumes later even if uninitialized.  A short cut for booleans.

Signed-off-by: Mark Hills <mark@pogo.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'topic/misc' into for-next
adding Probe-Perl-0.01
adding zlib-1.2.5
Aptana tried to add all these metadata files.
Merge branch 'develop' into develop-tom
allow in memory caching of templates
change notes for recent commits
allow no ws after <:= and <:%

<:=foo:> and <:%foo:> would return a confusing error.
Removed acp.
Housekeeping
Removed default mapping for bclose plugin.
Changed the data type to uint8_t* from char* in dump_buffer().
Changed maven version to 2.8.b3-SNAPSHOT
updatae kembrel materl
#40: link fixes across site
Corrigidas rotas dos assets.
* UFORadiant: extract eclassmodel code into separate files
* UI2: mini base selector in place on base and research windows
Added cordova.js to cache.manifest
Automate builds creation
Updated Android version
fix
2 or more WYSIWYG on a page
button function
fix html-mode btn
rus
example, readme
Moved tmhOAuth from vendors to Vendor (PSR-0)
CMake: Mark variables set by find_package as advanced, fixes #344
CMake: Mark variables set by find_package as advanced, fixes #344
Fixing remote_new compilation problems
Add missing file.
Merge branch 'master' of github.com:STEllAR-GROUP/hpx

Conflicts:
	hpx/config/preprocessor/add3.hpp
Fix bad merge.
Merge branch 'master' into mem_counter
Making branch upto date with master
Merge remote-tracking branch 'origin/mem_counter' into mem_counter
updating with remote
[maven-release-plugin] prepare release 1.2.0-cr1
[maven-release-plugin] prepare for next development iteration
Don't set CMAKE_BUILD_TYPE.
Factor out the code to manage a map from NumberOfExprs with identical
argument lists to values/vars in a separate class called NumberOfMap.
Suppress warnings in table handlers.
Remove duplicate models added by mistake
Use relative error both for testing the first and second derivatives.
Fix represent.
Merge branch 'master' of git://github.com/flavour/eden
Use modal dialog windows for location-link maps in tables. Fixes #302.
Temporary fix for person search (PR Homepage).
Fix UTF-8 decode problem in represent.
Merge branch 'master' of git://github.com/flavour/eden
Display who created a task.
Merge branch 'master' of git://github.com/flavour/eden
S3NavigationItem: mandatory-flag does not override authorization.
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/eden
Fix handling of joins in S3ResourceFilter
Merge branch 'master' of git://github.com/flavour/eden
Simplification of S3ResourceFilter.__repr__
Merge branch 'master' of git://github.com/flavour/eden
identity back in person simple search
Fix PDF export for correct use of ResourceFilter, URL queries should
never raise exceptions even if they're wrong.
Revert ealier change "Use modal window for location-link maps in
tables".
Merge branch 'master' of git://github.com/flavour/eden
Bug fix build_query.
support checkbox toggling in metadata editor
better editing
think of yui app
code cleanup for labeling support
Use coderay instead of albino and pygments.
Update README with info that albino is replaced with coderay
Add entry in changelog about replacing albino with coderay
Bump version to 0.3.1
impl bstream u24
moved fabfile
将schema exporter中整理namespaces的逻辑移到schema set中，以方便IDE plugins使用。
升级idea12以后，更新项目文件
Issue #TST-1: something to be tested
mongoid config modify
Prepare for shell-based runner
added belongs_to
Still having issues with initialising the foreign_key properties.
Aufgabe 1 und 2
irgendwie war 2 zu einfach...
sra accession bgy keyword script