labofsahil/github-event-dataset-2012 huggingface dataset:
目前格式：
 
联系方式：
13910985865 
songyu@chinawinhr.com.cn
应聘职位:
ID:8
宋玉
身份证号：110108197011104934男42岁
身高：171CM
体重：60KG
现居住于：北京，朝阳
户籍所在地：北京，海淀
 
修改为：
 
ID:8
宋玉
身份证号：110108197011104934男42岁
身高：171CM
体重：60KG
现居住于：北京，朝阳
户籍所在地：北京，海淀
联系方式：
13910985865 
songyu@chinawinhr.com.cn
应聘职位:
Switched to jquery ui-datepicker from bootstrap-datepicker, actually works! \o/
add annotations to GoRoutine GoConj instrumentation
fixing routine.go bugs
bumping to 1.38
A Milestone Commit

We rewrite sparsematrix class and related operations with STL.
Fix serveral bugs.
Now gem could be used to generate order2 remap files. Yeah!
wireframe B&B
active admin gem
update form mozilla
Updating homework 2.
version 0.2 popo

for changes, please refer to CHANGELOG

Change-Id: Id56187bdad0e4e9ee80ec20d1a8402b2fdd829b8
Added calculations for coherent measurement theorem.
Added definition of braket.
Added definition of $\mathcal{J}$ ancillary register.
Added not working(?) phase correlation and simple differance method functions
Changes are being tested:
added initial draft for frisian MT system
Propagate relation tags, which are listed in rendering_types.xml into its members.
Relation tags propageted recursivesly.
Fixed duplicate response bug due to occasional nil responses from PostageApp.
Move search box elsewhere.
started working on webui porting
Issue #3 reschedule for Beta
added log decorator and line counter
fixed bugs with values
fixed bugs with values
added more tests
minor changes
first draft version is ready
removed separator lines from README.md
Go fmt run
added p5-Clipboard
bump version number
supress lint warnings for values which doesn't need translation
Update requirements version
Wordcount: possession.scriv
- Content                   4589
- Synopsis                     7
- Notes                       45
- All                       4641
Wordcount: fairiesinthegarden.scriv
- Content                  39766
- Synopsis                     0
- Notes                        0
- All                      39766
Wordcount: kobosChronicles.scriv
- Content                  53276
- Synopsis                     0
- Notes                        0
- All                      53276
Wordcount: fiction/Ameli.scriv
- Content                 104717
- Synopsis                  1500
- Notes                        0
- All                     106217
Wordcount: timelines.scriv
- Content                    510
- Synopsis                     0
- Notes                        0
- All                        510
Wordcount: weddingPlans.scriv
- Content                   2197
- Synopsis                     0
- Notes                        0
- All                       2197
Wordcount: newStories.scriv
- Content                    286
- Synopsis                     0
- Notes                        0
- All                        286
Wordcount: ddKick.scriv
- Content                   9758
- Synopsis                     0
- Notes                        0
- All                       9758
Wordcount: K01_June12.scriv
- Content                  67088 (+3)
- Synopsis                    82
- Notes                        0
- All                      67170 (+3)
Wordcount: hip_final.scriv
- Content                      0
- Synopsis                     0
- Notes                        0
- All                          0
Current weather for Portland is Mostly Cloudy (70F/21C) Humidity: 36%
Wordcount: possession.scriv
- Content                   4589
- Synopsis                     7
- Notes                       45
- All                       4641
Wordcount: fairiesinthegarden.scriv
- Content                  39766
- Synopsis                     0
- Notes                        0
- All                      39766
Wordcount: kobosChronicles.scriv
- Content                  53276
- Synopsis                     0
- Notes                        0
- All                      53276
Wordcount: fiction/Ameli.scriv
- Content                 104717
- Synopsis                  1500
- Notes                        0
- All                     106217
Wordcount: timelines.scriv
- Content                    510
- Synopsis                     0
- Notes                        0
- All                        510
Wordcount: weddingPlans.scriv
- Content                   2197
- Synopsis                     0
- Notes                        0
- All                       2197
Wordcount: newStories.scriv
- Content                    286
- Synopsis                     0
- Notes                        0
- All                        286
Wordcount: ddKick.scriv
- Content                   9758
- Synopsis                     0
- Notes                        0
- All                       9758
Wordcount: K01_June12.scriv
- Content                  92475 (-142)
- Synopsis                    82
- Notes                        0
- All                      92557 (-142)
Wordcount: hip_final.scriv
- Content                      0
- Synopsis                     0
- Notes                        0
- All                          0
Current weather for Portland is Mostly Cloudy (64F/18C) Humidity: 56%
Wordcount: possession.scriv
- Content                   4589
- Synopsis                     7
- Notes                       45
- All                       4641
Wordcount: fairiesinthegarden.scriv
- Content                  39766
- Synopsis                     0
- Notes                        0
- All                      39766
Wordcount: kobosChronicles.scriv
- Content                  53276
- Synopsis                     0
- Notes                        0
- All                      53276
Wordcount: fiction/Ameli.scriv
- Content                 104717
- Synopsis                  1500
- Notes                        0
- All                     106217
Wordcount: timelines.scriv
- Content                    510
- Synopsis                     0
- Notes                        0
- All                        510
Wordcount: newStories.scriv
- Content                    286
- Synopsis                     0
- Notes                        0
- All                        286
Wordcount: ddKick.scriv
- Content                   9469
- Synopsis                     0
- Notes                        0
- All                       9469
Wordcount: K01_June12.scriv
- Content                  23412 (+276)
- Synopsis                     0
- Notes                        0
- All                      23412 (+276)
Current weather for Portland is Mostly Cloudy (57F/14C) Humidity: 67%
Wordcount: possession.scriv
- Content                   4589
- Synopsis                     7
- Notes                       45
- All                       4641
Wordcount: fairiesinthegarden.scriv
- Content                  39766
- Synopsis                     0
- Notes                        0
- All                      39766
Wordcount: kobosChronicles.scriv
- Content                  53276
- Synopsis                     0
- Notes                        0
- All                      53276
Wordcount: fiction/Ameli.scriv
- Content                 104717
- Synopsis                  1500
- Notes                        0
- All                     106217
Wordcount: timelines.scriv
- Content                    510
- Synopsis                     0
- Notes                        0
- All                        510
Wordcount: weddingPlans.scriv
- Content                   2197
- Synopsis                     0
- Notes                        0
- All                       2197
Wordcount: newStories.scriv
- Content                    286
- Synopsis                     0
- Notes                        0
- All                        286
Wordcount: ddKick.scriv
- Content                   9758
- Synopsis                     0
- Notes                        0
- All                       9758
Wordcount: K01_June12.scriv
- Content                  82206
- Synopsis                    82
- Notes                        0
- All                      82288
Wordcount: hip_final.scriv
- Content                      0
- Synopsis                     0
- Notes                        0
- All                          0
Current weather for Portland is Mostly Cloudy (71F/22C) Humidity: 68%
capitalization causes nothing but trouble. this fixes broken links because of file names not being capitalized.
Merge remote branch 'origin/master'
default to 127.0.0.1 and 3306
Merge pull request #262 from racker/fixes/default_mysql_details

default to 127.0.0.1 and 3306
Add 3.2.9.rc2 release announcement
eliminate duplicate number
New version of graphvis dot mode.
fixes #2409

git-svn-id: svn://develop.studip.de/studip/trunk@22416 c5b85792-5220-0410-ad23-ed5b6b8ad999
Change name of controller, model and view from about to profile #3130

git-svn-id: svn://develop.studip.de/studip/trunk@25044 c5b85792-5220-0410-ad23-ed5b6b8ad999
Expanded the document relationships page

I've expanded the document relationships page to provide many more
Include examples. This does refer to the new feature in
Ayende/ravendb/ree/1.2 that allows linq to be used against properties in
objects held in a collection. Therefore som of the information is not
yet relevant. Also, I have not been able to test the changes are
inclduing code etc. corretly as I don't have a way to render the
markdown.
Fix issue 9: backtab at line 6
19 foo
Fix TypeError on __str__
generated kernel files, Makefile fix - removed SpaceDiscretization
modify noise… it's now a nice noise, even if it loose some functions… Fix issue #1
COn las preinscripciones OK
fixed getAverageFps() call and AppCocoaTouch include
Merge pull request #1 from gaborpapp/fix-getAverageFps

fixed getAverageFps() call and AppCocoaTouch include
finished! but still need to fix issues with javascript follow buttons and access issues with _stats
Optimisasi Encoder

Mengoptimisasi encoder dengan menambahkan indexing

Signed-off-by: rinovan <reka.inovan@gmail.com>
Bug Memori

Parah, reka ra tanggung jawab
Что это за репозеторий
Add autocommit to SQLJob, fix bug in RunJob, and improve JMX
SimpleHandlerResolver.
Caribou lasers fix
Merge remote-tracking branch 'gizmor13/caribou'
added: kool tmux status bar colours
Container LVM default size change
Emit activity as None - the wouso core game
Avoid useless memset() in GWKGetPixelRow()

git-svn-id: https://svn.osgeo.org/gdal/trunk@25222 f0d54148-0727-0410-94bb-9a71ac55c965
(t1) on corrige à nouveau
Andrew and Aimee asset pipeline
LU-1923 lov: verify stripe is on given device

When restarting FIEMAP from a file with many extents, the first
supplied fiemap extent contains the offset of the previous last
extent found.  If this data is invalid, it may cause the LOV code
to acccess out-of-bounds array indices.

Verify data passed from userspace is within bounds.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I8e70e891b9f23c8f72aa78a4807369584ac2b04f
Reviewed-on: http://review.whamcloud.com/3962
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: wangdi <di.wang@whamcloud.com>
LU-1881 oi: not shrink the last entry in OI index node

Shrinking OI index node to recycle idle leaf for the last entry
will cause subsequent lookup/insert ops to access invaild space.
So just keep the last entry there, which can be reused directly
by next new node.

Other fixes:

1) The recycled empty OI blocks should be recorded on divice and
be re-loaded after the device remounted. Then they can be reused
when needs new OI blocks.

2) Need not check iam_container::ic_idle_failed in iam_new_node().

3) Clear iam_frame::at_shifted when iam_path_release().

Signed-off-by: Fan Yong <yong.fan@whamcloud.com>
Change-Id: I46611c208563a943a0980110b2c416186e6d1249
Reviewed-on: http://review.whamcloud.com/3931
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Tested-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: wangdi <di.wang@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
LU-1842 quota: remove quota code

This patch removes the quota code (from quota directory, but also
from mdd & obdfilter) which is going to be replaced by the new
implementation.
This patch also modifies the mdt to use the new space accounting
scheme as already used by the ofd layer.
sanity-quota.sh now also uses ofd by default and only runs the space
accounting tests until quota enforcement support is landed.

Signed-off-by: Johann Lombardi <johann@whamcloud.com>
Change-Id: I85cbbf6058859e5d19f80aa128f45b6d41c37d92
Reviewed-on: http://review.whamcloud.com/4098
Reviewed-by: Niu Yawei <niu@whamcloud.com>
Tested-by: Hudson
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
LU-1667 ui: fix inaccurate warning message.

Trivial fix to make stripe size message accurate. Message is
generated if a user issues a 'lfs setstripe' command with a
size 4G or larger. The corrected message now reads:
"stripe size 4G or larger is not currently supported"

Signed-off-by: Richard Henwood <rhenwood@whamcloud.com>
Change-Id: I6978e84aee547f40dc20f9b0bfa243d4960e084d
Reviewed-on: http://review.whamcloud.com/3464
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Cliff White <cliffw@whamcloud.com>
Reviewed-by: Fan Yong <yong.fan@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
LU-930 utils: minor fixes to lfs_migrate.1 man page

Fix the formatting of the lfs_migrate.1 man page SYNOPSIS section,
since ".Blfs_migrate" is not the same as ".B lfs_migrate", and hence
the synopsis was missing the actual name of the command it described.

Also fix some minor grammar issues.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ie0d8e3cd6fbab0663562b6a99f124ead953ebbe5
Reviewed-on: http://review.whamcloud.com/4440
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Keith Mannthey <keith.mannthey@intel.com>
Reviewed-by: Richard Henwood <richard.henwood@intel.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
LU-1337 llite: kernel 3.1 changes open_to_namei_flags

Kernel 3.1 changes the translation from open_flag to namei_flag,
(kernel commit 8a5e929dd2e05ab4d3d89f58c5e8fca596af8f3a).

So after 3.1, kernel's nameidata.intent.open.flags is different
with lustre's lookup_intent.it_flags, as lustre's it_flags'
lower bits equal to FMODE_xxx while kernel doesn't transliterate
lower bits of nameidata.intent.open.flags to FMODE_xxx.

This patch keeps lustre it_flags' semantics and add
ll_namei_to_lookup_intent_flag for translation.

Signed-off-by: Liu Xuezhao <xuezhao.liu@emc.com>
Change-Id: I408685040688bae574d04cf288abb6ca967607df
Reviewed-on: http://review.whamcloud.com/3583
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
LU-1337 llite: provides ll_get_acl to ->i_op->get_acl

Since kernel 3.1 generic_permission() has lost the check_acl
argument, ACL checking has been taken to VFS and filesystems
need to provide a non-NULL ->i_op->get_acl to read an ACL
from disk.

This patch is a complementarity to http://review.whamcloud.com/3397
(d018b087c962b8c66e8dc479fc66e964a2e5fd94), to fix failure of test_25
of sanityn.sh.

Signed-off-by: Liu Xuezhao <xuezhao.liu@emc.com>
Change-Id: Ica96adac03c1792e2e8b668b959457a4ffec9a43
Reviewed-on: http://review.whamcloud.com/3885
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Support of type tree rebuild in files with custom extensions.
Closes #402. Updates boots.
Issue #402. Fix a bug.
Issue #402. Improve pretty print.
Add some null checks.
Add documentation file for debug build.
Fix of start by Ctrl+F5
Update readme.
Revert "Add documentation file for debug build."

This reverts commit 766198ea265742354ba66aa9943db1f435ceb2bd.
Improve the ignore macro.
Workaround for handmade goto in expressions.
Updating forms. Fixing regex in validation.
fix closest mex calculation
Add support for HTTP Negotiate/SPNEGO authentication
Fix cut-n-paste error in the name of a gssnegotiate test
Merge pull request #48 from jheiss/gssnegotiate

Add support for HTTP Negotiate/SPNEGO authentication
fix for #53
preparing v1.0.0
fixed typo
support adding cookies from response to request
bump version to 1.1.0
Merge pull request #55 from mrreynolds/patch-1

fixed typo
Fixed where the "Cookie" header can be invalid

When there are no cookies, the "Cookies" key shouldn't exist.  The
existing behaviour was to allow it to be nil.

initialize_http_header in module HTTPHeader (net/http.rb) iterates over
all headers.  When "Cookie" is set and is nil, this method freaks out
when trying to call value.strip.  If the "Cookie" header has a value of
nil, it should not be included in the headers hash.
code formatting and style
preparing v1.1.1
merge branch 'master' into em_http

conflicts:
	spec/httpi/httpi_spec.rb
don't load curb for jruby

travis doesn't support c extensions.
first commit
added gitignore
deleted ds_store
fixed nav level
updated pages
Turn off Rubinius 1.8 mode, which is problematic.
Removed the About page. Will add a better one later.
JSONPを使用するようにする。
use io.EOF to mark end of interactive session
Remove unnecessary depedencies on cookbooks we don't have or need.

This also fixes uploading the cookbooks to a Chef server, as mentioned
in issue #204

Change-Id: I3e74af39e86c449904e251fa3ca5241d457c1f1d
Disable dev_setup installation of Neo4j

Change-Id: I78b7c99a7ef0e27b4f7884ddaca2850ab9011027
[dev_setup] Fix mongodb on i686

Change-Id: If7772bdee7959e24253cb9e1ac80ccec76b2d34d
Add missing character

Change-Id: I6451d46d25ebc1790e1ce3d0271dcf39899dea87
Merge "Remove unnecessary depedencies on cookbooks we don't have or need."
bump test submodule pointer.

Change-Id: Iad4be6089e14c9f023e2a3d0f9321f3458be3b3c
Bump JRuby version to 1.6.7.
remote: don't free transport on disconnect

Currently, git_remote_disconnect not only closes the connection but also
frees the underlying transport object, making it impossible to write
code like

	// fetch stuff
	git_remote_download()

	// close connection
	git_remote_disconnect()

	// call user provided callback for each ref
	git_remote_update_tips(remote, callback)

because remote->refs points to references owned by the transport object.
This means, we have an idling connection while running the callback for
each reference.

Instead, free the transport later with git_remote_free() or on explicit
call of git_remote_free_transport().
npm name 'rest-template' -> 'rest'
tun/tap/bridge/vlan
Add puppet settings adhering to the guidelines
Add puppet plugin
added arithmetic operators
add simple gui
add command behaviour
add command apply on key event
update punch clock
add simple menu
add counter tests
fix command async crash
fix close menu option
rename stuff & add simple grid renderer
add proper exit & funny blinking
add animation speed throttling
add block movement interface
add rotation hotkey
update punch clock
added unit.create Method, lots of method adding on the go
case of non-numbered WNs
context switching to make closures work properly
rails new joe, bundle install and rails s
Update tuning tables.
made the team search case insensitive
Implemented show and hide methods for oval and rect elements.
dfbf
Change coment style for better autogened documentation
moved user profile inset
Change file naming scheme
Change in use of ReleaseConnection
Improved logging functionality. A few cosmetic fixes.
3 graph in 1 in linear
Split projectinto modules and started codegen. Fixed PDA inner structure a bit.
Implemented LL(1)-parsers codegen.
Added a test for a "Not initialized"-exception being thrown
Added npmignore so the module doesn't have to be 20mb (and ruin heroku)
Cleaned up the test a bit. Added a file-size assertion
Fixed the drain bug. Now the tests pass once again\!
nodes are now controllers
fixed minor test bug
Added Travis build status
Adding LRM changelist
updating LRM pdf
Float(int) -> Float
correct Mul._eval_power: no auto-expand for integer
determinism for trigsimp; use small_first_keys in solve

Now that cse is deterministic, trigsimp (which used it) is, too.
deterministic risch algorithm

In the places where atoms were being iterated over, a canonically
ordered list is being used instead, now, which should give
system invariant results. In addition, only the new atoms
that haven't been seen before are being filtered in a
common function `update` that appears just before the while-loop.
debug kane test
int_tested returns [] if no args or empty arg
permutations: drop singletons from cyclic_form
permutations: add DisjointCycle class
added checks for depth
small bug fix in interval_arithmetic
refractoring, renaming of variables, more comments.
tests for plot_implicit.
Added __rpow__ to the functions implemented.
tests for __pow__ added
Small fixes.

1) xlim and ylim are set in plot
2) Random symbol is created if there are less than 2 free variables
Small fixes

1) Moved _matplotlib_list to matplotlib backend
2) Renamed get_meshes() in plot_implicit to get_raster
3) Improved the documentation
4) Dummy used when there are less than 2 free variables.
moved the imports below the docstring
removed spaces near
np.inf replaced by ``float('inf')`` in tests.

numpy dependency in tests is avoided.
Improved test coverage for plot_implicit
Code coverage now > 90%
removed unused imports
documentation changes
interval_arithmetic basic not dependent on numpy
fixed numpy import errors
removed import checking for intervalmath
Removed implicit imports
matplotlib test check changed
Added extra days to cinema API.
Extend testing to cover case of large queues.
MySQL driver now doesn't do second strlen() lookup.
Switched from alarm() to setitimer.
Fix for OSX
Autoconf fixes plus compiler issues on OSX.
Update AX_CHECK_SOCK_CLOEXEC macro.
Update uuid (test from having uuid support).
Test with run, not link.
More updates around uuid
Adding in .37
Twitter search fucntion created and twitter location id and tweet added to msg_twitter_search_results
campaign
Merge branch 'master' of https://github.com/softweb/LMLP

Conflicts:
	lmlp/app/controllers/campaigns_controller.rb
Merge branch 'master' of https://github.com/softweb/LMLP
add error message
quetzal-vpn installs cleanly. doesn't work though
added a dev-requirements.txt for travis-ci
edit disbursement layout
debug:
- updated : db070 avatar_properties_update to d7
change:
- optimized : db 070 save_profile
debug:
- updated db070 avatar_properties_request to d7
debug:
- updated db070 user_preferences_update to d7
debug:
- db 070 profile_save when creating a new user
debug: -rest profiles mention error
Revert "Added nuibi SLDPRT as a fresh approach at maintaining a fully parametric model"

This reverts commit 5260621ced5dce17bcdd80928afb1bb89083fd7d.
Merge branch 'master' of https://github.com/starno/Niubi

Conflicts:
	Solidworks/Niubi.SLDPRT
все что связано с регистрацией активацией входом восстановлением и повторной отправкой писем при сбоях написал.
Add explicit referenced counted binary creation in NIF API
Add refc binaries reference counter access in NIF API
Add referenced counted binary release function in NIF API
Make refc get function name more consistent
star tags change OT done.
l10n: Fixes to Swedish translation

Tersify texts overflowing an 80-character terminal.
Fix spelling mistakes.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Merge git://github.com/git-l10n/git-po to update Swedish translation

* git://github.com/git-l10n/git-po:
  l10n: Fixes to Swedish translation
Merge branch 'master' into next

* master:
  l10n: Fixes to Swedish translation
Documentation: update URL for formatted pages

The one at kernel.org has not been updated for quite a while and
can no longer be called "the latest".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/doc-git-updates' (early part)

* 'jc/doc-git-updates' (early part):
  Documentation: update URL for formatted pages
Merge branch 'master' into next

* master:
  Documentation: update URL for formatted pages
Getting the right field to recompose the sshkey
Including PFBC folder for complete transfer ability
Add some improvments

Display informative connection messages
Set default connection timeout to 30s
Make curl silent mode permanent
Set 'fileformat' to 'dos' (tolerate server line endings)
Fixed bug in simulator - should be number of characters, not codons! (Thanks to GT)
마이너 버그 수정
Change autoclose to smartinput
Push / pull plugins and snippets
string interpolation requires double quotes, syntax issue on array creation
dont iterate over unmanaged hosts if its nil
Merge remote-tracking branch 'upstream/master'
adding matrix4 files
Captions for Cole Gallery
Refactoring Atmega2560 to work in a unified memory scheme
Fixed a bug in pop() that prevented Atmega2560 to return from methods.
WIP: Basic support for timer/counter 0 (interrupts included). It doesn't work yet thought.
Also updated simulator initialization to match the new interface of the engine.
Fixed a few bugs in atmega2560 related to timer0 and interrupts.
use standard vim plugin conventions
Update sort vertex & edge
- Add Object::hashCode()
- QA: WS
- Initial implementation: lang.Type superclass, primitives
- Next steps in type system implementation: var, void, inclusion in omnipresent classes
- Implement Parameter::getType()
Removing user files.. as .gitignore should prevent these from being included in the repo from this point further.
Stricter indent checking and moving to state for newline handling
Fix i18n/backend/key_value to add data in a array
A more helpful message when number of plurals on po file is inconsistent with I18n::Gettext.plurals_keys.
Allow mutually recursive mappings

Where translations are drawn from different sources which may be using
different codes for the same language it can be useful to have mappings
where two codes fallback to each other.

This patch allows that by ensuring that the recursion in the computation
of the mapping terminates instead of running out of stack.
Minor documentation update missed in last minor documentation update
Merge pull request #97 from nledez/master

Fix to close issue https://github.com/rails/rails/issues/1499 i18n with key/value backend 
Merge pull request #118 from e-travel/better_invalid_plurals_message

A more helpful message when number of plurals on po file is inconsistent 
Merge pull request #130 from tomhughes/master

Allow mutually recursive fallbacks
Merge pull request #152 from markmcspadden/patch-1

Minor documentation update missed in last minor documentation update
Remove 2 particularly contrived specs

They were both identical, failing under jruby, trying to access instance variables etc..
Merge branch 'master' of github.com:svenfuchs/i18n
- Empty YAML files still raise InvalidLocaleData under 1.9.3
- add 1.9.3 to travis' rvm list
Fix a silly typo
Also rescue SyntaxError for earlier versions of Psych
Cool dropdown menu
actual dropdown changes
moved build system to maven (sorry for the phat commit)
added recipes for hightide and eclipse distributions of jetty
Customizable font style
ProjectTemplate
sqldf
sqldf depends on gsubfn, which depends on tk
check for yaourt
wifi-select is in the aur
refactored AdjustableFilterProvider to use IFilterAdjuster instead of Func<Filter, Filter>
contemplating how to comment...
Use unless instead of bang.
Update README to add note about making sure iTunes is playing

If you try to visit the play app and the iTunes DJ playlist is not already playing, the queue will just repeatedly error out.
Merge pull request #121 from wfarr/patch-1

Small README updates for gotchas
Update uploader to support more extensions
Add initial iCloud/iTunes Match support

* Tracks in the cloud can now be queued to the iTunes DJ Playlist
* Album song-searching now looks at tracks in the cloud
Merge pull request #122 from wfarr/upload-all-the-formats

Update uploader to support more extensions
Merge branch 'next-add-airfoil-support' of https://github.com/joeyw/play into joeyw-next-add-airfoil-support
Fix exists? call
We want system audio
Sane spacing
Volume endpoint is adjusted by system output
Tests shouldn't touch system apps
Revert "Use unless instead of bang."

This reverts commit ad912d8c930c7d20436fbb66091499082691c7d7.
Merge pull request #124 from wfarr/icloud-lovin

Add initial iCloud/iTunes Match support
This doesn't do what you think it does
omg fuck guis in my tests
Merge branch 'next' of github.com:holman/play into next
Revert "Update uploader to support more extensions"

This reverts commit caaf29a10ee5310c5d7824978c318515d8e67a46.

This also just doesn't work.
save the play.yml and remove exit when nicecast is not installed
Merge pull request #128 from nandub/next

Add saving config/play.yml to script/bootstrap
topic: slab poisoning
tmuxのマウス操作無効
Merge branch 'master' of github.com:ton1517/home
Update install for 4.2.1
uploaded a scrubber function and added it to NAMESPACE
seitsemäs
Remove unused variable
Don't make directories during dry runs
Clean up exception hierarchy
Initialize variables from environment
Implement variables as attributes
Tweak logging format
notes and thesis
Merge branch 'master' of github.com:uberj/BB-331
work
Fixed issues with pull request #2
pridano vyhledavani pro vyrobky a kategorie
#5: Added about, site, developers and licens to about page
#12: Removed animation on popup and zoom
Removed unused images
Lang: getType - ext and ref
added server
Merge branch 'master' of git@github.com:verachai/RSA
Physics update loop complete

Refactored checkForCollisionsAndUpdateBallState. I still don't like the
facto that this function does too much...
checkCollisionWithPlayers and checkCollisionWithFieldDelimiters to be
unit testable.
preload optimize
update q4 question (in -> int)
Removed helpers.tr
Removed helpers.tr from fixers
Removed helpers.tr
Removed helpers.tr
Removed helpers.tr
Removed helpers.tr
Updated ts
Commented helpers.tr function
Merge branch 'master' of git@github.com:vlkv/reggata.git

Conflicts:
	src/ext_app_mgr.py
update
update
update for public
ajuste dos titulos
more cleanup of my junk
Removed dependency for entity
Added flexibility for URL input
Merge branch 'master' of https://github.com/wecohen/coso
moving todo.txt into github issues
Saved project opens on correct plugin. working on save/open and right-click
Bugfix for 27359125; Log change request cancelation
Fixed mutex and timeout bugs
Added read_last method to VUsbHid

List set to finite length
util: remove dead casts

The sequence:
  long long val;
  if ((long long) val != val)
is dead code.

* src/util/util.c (virStrToLong_ll, virStrToLong_ull): Remove
useless cast.
storage: Allow multiple hosts for a storage pool

The current storage pools for NFS and iSCSI only require one host to
connect to. Future storage pools like RBD and Sheepdog will require
multiple hosts.

This patch allows multiple source hosts and rewrites the current
storage drivers.
ui networking almost done
fixed compilation error with GCC 4.2
#1 setup the project with the pom.xml, snow, jquery, brite, twitter boostrap
#3 datamodel server side and dao.
removed pywendy
run.py: improve handling of multiple Android devices

* do not lose auto-selected device while running several tests
* reduce output noise
* list available devices if unable to auto-select device
* fix error message when no devices connected
run.py: add --check option for easy run of sanity checks
OpenCV app framework improved

FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
Attribure loading from layout improved.

OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
Samples updated

In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
Code review comments applied.
OpenCV Manager build via ninja (Bug #2575) fixed.
Merge pull request #189 from wswld:2.4
Merge pull request #188 from asmorkalov:app_framework
Base for new sample added.
Tutorial-5 functionality implemented.
Android: always sort list of NDK toolchains

Order returned by CMake is unreliable but we need clang to go after gcc for
automatic toolchain selection.
Merge pull request #190 from asmorkalov:ninja_fix
Merge pull request #175 from taka-no-me:run_py
increased time-limits
increased time-limits
Merge pull request #192 from taka-no-me/ndk_selection_fix

Android: always sort list of NDK toolchains
Merge pull request #193 from AnnaKogan8/perf-tests-increase-time-limits

Increased time limits for perf tests
Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied.
now invert 3x3 on "bad" matrices works well on Windows
first commit for ch5
noswapfile
t_Co, noswapfile
Add views of own groups and memberships
fix xm_ruf_fopen
change module
re add module fugitive
FINISH CONTROLS FOR WIND, MESH, REINIT
Dodanie zalozen projektu

Dodanie pliku excel z zalozeniami projektu.
reconstruct the source folder
Corrigido pom.xml. Ao menos a execução da classe Persistencia agora já
é bem sucedida.
correciones para eliminacion
Pequeños cambios en la redaccion sobre la arquitectura
Added DataSet alias

Change-Id: I4b07a4744478111dc9ff0f50d98d920f177c5ac6
Fixed wrong method name used - forEach instead of each
Fix broken links in README.md
Merge pull request #96 from kevinm416/master

Fix broken links in the readme
Make ex commands :tabe, :tabedit and :tabnew have the same behaviour.
Merge pull request #24 from ethercrow/vim_compat

Make ex commands :tabe, :tabedit and :tabnew have the same behaviour.
nilとかはグローバル環境に入れておく:fish:
ThawInstがThunk以外に掛かった時は単にCodeを一つ進める:snake:
Acquisition value with REAL

Signed-off-by: abaouz <abaouz.hamouche@gmail.com>
goplay.l: マルチバイト文字を含むコードのポストに失敗するのを修正
item tuner objects now survive complete program
put steps in collection, merged tuner with step object
* plotgrids.ncl: updated to new version
* poly.ncl: improved poly line plot
fixed compilation to flash with cocktail
merged silexlabs/Brix develop
Merge branch 'develop' of https://github.com/silexlabs/Brix into develop
Merge pull request #87 from zabojad/develop

further renaming changes
Merge branch 'develop' of https://github.com/silexlabs/Brix into develop
added accordion component
Merge pull request #88 from lexoyo/develop

added accordion component
Merge branch 'develop' of https://github.com/silexlabs/Brix into silexlabs-develop

Conflicts:
	src/brix/component/layout/Panel.hx
Catalog page done.
added Romanian Translation
Move Win32API binding to a new directory

So it won't be included to the Gem distribution.
Rename MSVC test project source directory
Remove legacy build event

No longer need to copy DLLs from lib (in fact there's no such directory
anymore). We assume the user has all the pre-requisite (OpenAL) DLLs in
the load path.
Clean up unused configurations for libmpg124
Abstract Win32API calls for Seal
Bind most Seal module methods

Not including the listener singleton getter.
Remove extra space
Abstract common stuff into core.rb

And make seal.rb a frontend.
Add initial win32api binding for listener
Work around a possible bug in Win32API

The return value of get_err_msg somehow becomes an integer in Ruby 1.9.3.
1.9.2 and 1.8 works fine.
Use Array.new to build the buffers
Add win32api binding for listener gain
Update comment to include the buggy version
Abstract 3 float setter
Add binding for velocity
Shorten Win32API object names to match seal API
Add orientation binding
Singletonify Listener class
Add Format module
Require relative to the file

Instead of relying on the current working directory (unreliable). To be
compatible with Ruby 1.8, require_relative can't be used.
2012-4-16 from zhao-laptop
rm gmm.sh
more basic plots for pf
the base classes of OpenCL backend are now abstract

In fact the kernel can be changed between iterations. Though this is
not very robust and need some rethinking
cleanup
bump version number
move static_assert to namespace vsmc
on the way to implementing fully functional nodesets
added nodesets, but not pushing them to DB
Merge branch 'master' of github.com:zhum/hoplang

Conflicts:
	paramtest.hpl
_config.yml changed

= to :
Added :url in project.clj
Fix getting world ref.
Fix property name in KkbEpay_Order
Rolled back changes specific to Impact.org.
NOTE: They are need to be refactored
Started upgrading FEWS script
Merge branch 'master' of github.com:AIFDR/inasafe
Small update in out-commented code, just in case
Better docstring, input checks and cleanup in grid2points()
Finished unit tests for flood forecast data preprocessing closing #448
Cleanup of generated test file
Merge branch 'master' of github.com:AIFDR/inasafe
Separate AXRTestProducer and AXRTestThread into their own files.
Chapter 2 exercise 2-6
Made all pages ready for js
added bomb and baloon
Merge branch 'master' of https://github.com/Adhesion/ld24
contact-us page fixed
Fixed bug in last update.
Added all new fields to request Groups and GroupTypes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
	SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
Removed stars sequence from password summary when password is empty

git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@250 5bc14d19-1e4b-4ba2-aa50-860af135f48c
Removed old ksoap2-android version

git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@251 5bc14d19-1e4b-4ba2-aa50-860af135f48c
Added new ksoap2-android version
Merge branch 'develop' of github.com:Amab/SWADroid into develop
ARELLE-52: change formula arc check warning messages for compatibility
with XWand, no warning if the arc end resource does not have a loaded
schema definition, but if it is loaded and the arc end isn't the
right kind of resource then the warning is still provided.
Implement to_json for file and folder.
Implement get contents.
code cleanup
Collects Ext.data.Store filter data and set it in the pagination array
Merge branch 'master' of github.com:Bancha/Bancha into filter-support
Merge branch 'master' into filter-support
Created public API for setting remoteFilter configurations in Bancha
Updated links to new documentation
A better description for 'rhc sshkey remove' spec.
A simple spec for 'rhc sshkey update'.

TODO: Warning message for deprecation.
Add file
Merge pull request #1 from StasSarosek/master

Add file to master folder
[FIX] GUI/Core: GH-459, GH-465: update database list
[MOD] minor cleanups
* correction : erreur quand aucun items dans le flux.
 * correction : échappement de caractères spéciaux.
 * correction : mise à jour des mois dans le parser.
EasyMotion <Leader><Leader>w
finalized layout for prototype
Merge branch 'lightbox-smd' of github.com:C3MA/Lightbox into lightbox-smd
Security fixes in controllers
agregando el ignore a la carpeta uploads
Fixed some qwirks in tmux
Fix acceptance #2220 r16743 r16843

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@16887 b5f69653-2bf5-0310-8201-b0dafb8e1405
Updated N900 and i586 ks and README
Completed basic math operation actions.
Pawn can now be promotted. Only Tie is left to be implemented, then possibly clean up the code a bit.
Changing icons to bigger size
escaped pusher api key
removing dog balls
upgrading to a better Vader
MOTHERSHIP: Testing config sending code

Code set up to test that the config JSON is getting stringified and parsed 
correctly on the Quasar side
Add configuration file and web UI option for changing pcap buffer size
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration

Conflicts:
	NovaWeb/main.js
MOTHERSHIP: Scheduled Events are saved on Mothership signal, reinitialized on Mothership startup

If Mothership encounters SIGTERM, SIGKILL, or SIGINT, it will save the 
current scheduled events to a file, to be parsed for events upon next
startup.

Issue: #379
16:30

doku bis klassendiagramm
removed the etc
Typekit & Proxima Nova soft.
taxize tutorial files added
changed parsed_content to content in ubio_namebank fxn
Adicionado API para o Chat
add preview assets & remove is_spotlight from articles
add navigation & ordinary links
global refactoring
OpenVPN management plugin added
LoginRequireEverywhereMiddleware, oembed templates, minor improvements
topic_new signal
Add newline to upDown train output.
Final polish on the theory.
Update PS1 based on feedback.
Tentative de fixaton de translate. Si tu vois ça, aide moi.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3dec: perform I/S and M/S only when frame mode is joint stereo.
  id3v2: add another mimetype for JPEG image
  lzw: prevent buffer overreads.
  WMAL: Remove inaccurate and unnecessary doxy
  h264: fix cabac-on-stack after safe cabac reader.
  truemotion2: convert packet header reading to bytestream2.

Conflicts:
	libavcodec/lzw.c
	libavcodec/truemotion2.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cavsdec: ensure the tables have been allocated before using them

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat: Fix several "incompatible pointer type" warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dvbsubdec: Fix "set but not used" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
interplayvideodec: pass correct pointer to av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
j2kdec: fix format strings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
j2kenc: Fix "function declaration isn’t a prototype" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mjpegdec: Fix "assignment from incompatible pointer type" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mpeghaudiodec: Fix "set but not used" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
svq1enc: fix ptr type mismatch warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
allowing template override
Merge pull request #315 from gobezu/master

Slight change to afford template override of css as well
Added code for handling skiping of instructions
Updated code and REFERENCE for 4 stacks
Finished register_swap()
Finished stack_swap()
Finished stack_shift()
Minor changes
Finished execute()
Added something for Direwolf20 :P
Added options to the add instance button that allow users to easily
import their existing .minecraft folders and duplicate existing
instances.

The duplicate instance option is not implemented yet, but import is.
upadate package.json with dev dependencies and updated readme
initial setup of project files
Added initial threading test. Removed old main file.
One include, to rule them all.
Moved main to examples folder.
Added example. Note that sockets seem broken?
Virtual stuff.
New example.
Reworked the exceptions.
Removed example's .cpp file.
Added support for the Runnable interface. Added example.
Fixed include and namespace.
Added exception.
Fixed indention. Added exception.
Indention fix.
Removed newline.
Fixed http example. Worst example ever though.
Merge branch 'master' of github.com:Gerjo/libyaxl
use old urls for now
added ruby support
added heroku toolbelt
Corregir Sign in
Reskin the Scroll of Resurrection frame.
3.5.2
Fix auction house pushed textures.
Change dropdown menu highlight.
Reskin dropdown check/radio buttons.
.project
	css/
	index.html
	js/
new/improved Python samples by Alexander Mordvintsev
Merge remote-tracking branch 'origin/master'
updating README content
updating URL to Android info start page
Intermediate files generated by Android toolchain are moved into CMakeFiles subfolder
Added ignore for tbb source tarballs
Fixed build warnings (including error in FAST)
Fixed xml name generation in run.py
Normalize whitespace in documentation and text files
The bot can now read config files!
Merge branch 'master' of https://github.com/JKillNazi/JKN.git
maven plugin was putting stuff in the wrong directory due to a bad search/replace
Update license headers
UP-3594 Fix package name
Started part 2. Available/Unavailable server logic
Add provided dependencies for startup module
Created a Node Branch to attempt a recreate in NodeJS
Removed Django files from this branch.
This branch is for Node development of the application.
This commit has removed the django files from the application


Signed-off-by: David Sivocha <david@sivocha.com>
Created NodeJS base with ExpressJS Framework.
added the framework files to the project to start development
in NodeJS.


Signed-off-by: David Sivocha <david@sivocha.com>
URL definitions
Recreated the URLs from the Django version.
TODO: point them at seperate Views
TODO: set if statements to handle settings


Signed-off-by: David Sivocha <david@sivocha.com>
Included the settings module
Added a file to define the settings elements that are used
throughout Syte. Currently commented out RSS until I can
Substitute the URL for something that will work with node
as opposed to the Django format that is currently used.


Signed-off-by: David Sivocha <david@sivocha.com>
Included media from Django Version
Included the CSS and Images from the original version


Signed-off-by: David Sivocha <david@sivocha.com>
Settings and URL modifications
modified the Setttings to export properly.
Used the new exports to control which URL's are created
based on the structure used in the Django version.
Updated .gitignore to ignore the node modules install folders


Signed-off-by: David Sivocha <david@sivocha.com>
URLs Routes and Logic
Pointed the URL's to the correct view functions.
Set up a series of view functions in routes.js to handle
application logic.


Signed-off-by: David Sivocha <david@sivocha.com>
Template engine changed to Handlebars
Changed the template engine from the jade default to
Handlebars due to it's similarity to the Django templating
language.

Signed-off-by: David Sivocha <david@sivocha.com>
Merge branch 'master' into node
fixed up settings
sbt update to 0.11.3
Locales
- removed binary files
Merge branch 'master' of github.com:Jmgr/actionaz
Updated proof-tutorial to match main proof control
reworking lwrp to be more simple
use an attribute to install libraries
первое предложение Кушнерук В.Р. Кс-84-09
prevent admin from deleting themselves
extra safeguard for self-deletion
Add a real makefile