labofsahil/github-event-dataset-2012 huggingface dataset:
Fix false convergence when singleton cluster, see #2222

* All members must be in seen table for convergence
* Added extra debug logging due to convergence issues
* Enabled test of convergence for node joining singleton
  cluster
Rename + operator of VectorClock and Versioned to :+

* + is kind of reserved for string concatination
Correct? implementation of merge and other actions, see #2077

* Merge unreachable using  highestPriorityOf
* Avoid merge result in node existing in both members and unreachable
* Fix joining only allowed when !alreadyMember && !isUnreachable (non Down)
* Fix filter bug of unreachable in downing and leaderActions
* Minor cleanups
Minor cleanup, based on review comments, see #2077
Merge seen table by starting with empty seen after merge, see #2077
Add invariant assertions to Gossip, see #2077

* Add doc about how members are "moved"
import MemberStatus._
Additional check of expectedAddresses in listener tests
Improve debug log message of no convergence, see #2222
Merge pull request #536 from akka/wip-2222-singleton-convergence-patriknw

Fix false convergence when singleton cluster, see #2222
Improve docs based on feedback, see #2077
Merge branch 'master' into wip-2077-gossip-merge-patriknw

Conflicts:
	akka-cluster/src/main/scala/akka/cluster/Cluster.scala
Merge pull request #537 from akka/wip-2077-gossip-merge-patriknw

Correct? implementation of merge and other actions, see #2077
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into newcompiler
rename difff as ddif
funcionando el admin
update server function
Otra vez prueba!!!!
Added introduction on lab3
[mms] Correctly remove unseen information from folder tree in dynamic mailbox view when mailbox is marked as not polled for new mail.
Released Horde_Stream-1.1.0
Development mode for Horde_Stream-1.1.1
Fix expected exception.
No idea how this test was supposed to work.

exists() always expects the share name, not the id.
Kolab stores all day events differently than anybody else, add a day (Bug #11767).
Fix end time.
[jan] Remove creator permission mapping from Kolab backend (Bug #11713).
[mms] Fix client-side address sorting (Bug #11820).
Released Horde_Imap_Client-2.3.1
Development mode for Horde_Imap_Client-2.3.2
[mms] Add SORT_DISPLAYFROM_FALLBACK and SORT_DISPLAYTO_FALLBACK sorting criteria to Horde_Imap_Client_Base#search().
Merge branch 'master' into imp_6_1
Fix formatting of message headers/attachment list
Rename target page to copymove
Catch nodelete flag, and disable move if mailbox is marked readonly
Update package.xml
Blur refresh button after click
Fix inset styling of attachment list
Removed unused serialize functions.
Fix version number.
Update nl translation.
#83 Restructured text for better organic search
Close #90: The img.onload callback fixed the issue; finally ;P
exporting to xls
[rbp] added a minimal doc file
[webinterface.default] fix song view of a specific album
[aml] fixed overscan clamp. use g_graphicsContext.GetViewWindow, it contains the right width/height corrected for overscan settings
[aml] refacor set_sysfs_xxx/get_sysfs_xxx into AMLUtils
[aml] add aml_set_audio_passthrough to AMLUtils so we can reuse it in other areas
[aml] move aml_cpufreq_limit out of AESinkAUDIOTRACK.cpp and into AMLUtils where it belongs
[aml] add aml_present function
[aml] fixed passthough when using dvdplayer instead of amlplayer
Silence compile warning
Silence log entry
[AE][WASAPI] Reduce log spam
[AE][WASAPI] Cosmetics
[AE][SoftAE] Reduce log spam
[AE][SoftAE] Show friendly name of device
[rbp] fixed only deinterlace on SD and 1080i
[rbp] fixed omx tunnel deestablish in destructor could lealead in unexpected behavior, wrong log message and some minor cosmetic
[rbp] fixed broken omxplayer audio stream switching
Be less vocal when we can't find an librpm-referenced package in the transaction set
Rremove PID
Made non-spout blackholes possible.
config files will automatically be updated
Will use endportal block for non-spout blackholes
must have bSpace.ignoreblackholes to break it
Also, made some places thats use Defaults use static imports. Much easier
Merge branch 'master' of git@github.com:iffa/bSpace.git
Fix tracker bug that tickled a much worse issue in ttorrent (unclosed connections)
hisimhv update to version 1.2.3
hisimhv update to version 1.2.3
Forget the previous approach.  Kraken combiner now always annotates the combined source with the names of the sources of which it is comprised.
Only run mathn specs on supported platforms
removed unnecessary closure
fixed whitespace consistency
improved idiomatic jQuery
tweaked function declarations to appease JSLint
updated jQuery UI upgrade instructions

due to asset pipeline, directory structure has changed and minified
version is no longer being used
upgraded jQuery UI

v1.8.16 to v1.8.20

general maintenance; includes various bugfixes (though nothing in
particular)
removing java/util/Zip from native methods, in favor of patching the JCL with jazzlib
basic threading support!

We have a GIL now
Added components to equipment superclass
More cluster event consistency

Regarding discussion in #3198.  Passing the worker as an argument
to an event emitted on the worker is redundant, and an unnecessary
break in consistency vs the events on the ChildProcess objects.

It was removed from 'exit', but 'listening' and others were
overlooked.  This corrects that oversight.
libuv update for ftruncate
Remove unutils component SessionList.
Update Basic28/src/FirstPython.py

make same
set-things-up: Added Eclipse setting-up
crash when xml file not found
crash when xml file not found
xml parser modify
Merge branch 'master' into develop

Conflicts:
	com.fonenet.fonemarket.MainActivity/res/layout/activity_tab1.xml
	com.fonenet.fonemarket.MainActivity/src/com/fonenet/fonemarket/FoneNetXmlParser.java
for crash
layout adjust
restruct the code structure
add list activity to display variable tab list view
adapter 的修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.fonenet.fonemarket.MainActivity/res/layout/activity_tab1.xml
	com.fonenet.fonemarket.MainActivity/src/com/fonenet/fonemarket/Tab1Activity.java
Merge branch 'develop'

Conflicts:
	com.fonenet.fonemarket.MainActivity/src/com/fonenet/fonemarket/activity/Tab1Activity.java
	com.fonenet.fonemarket.MainActivity/src/com/fonenet/fonemarket/adapter/MyAdapter.java
	com.fonenet.fonemarket.MainActivity/src/com/fonenet/fonemarket/utils/FileUtils.java
regular expression string representation at noam.re.string
Formed a comment for cgo.
Imported associated header.
Imported a version of aes_locl.h.

Original location:

    http://www.opensource.apple.com/source/OpenSSL098/OpenSSL098-32/src/crypto/aes/aes_locl.h?txt
Fixed some build errors.
Declared OpenBucket.
Fixed formatting.
remove boilerplate readme file
inicia el proyecto de TSI1
fix lang names.. legends: display:none ..
Fix typo in configuration parser.

This caused empty lines to cause parse failures.
Fix bit depth detection of the toolbar image for debug builds

Patch by foxx1337
This commit fixes ticket #2152.


git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4272 10f7b99b-c216-0410-bff0-8a66a9350fd8
Merge branch 'master' of github.com:jeffwar/ucc
Merge branch 'master' into op_oo
Build: generate a file containing package name for testapp and fonts, for the nightlybuild script of jelix.org
Merge branch 'jelix-1.2.x' into jelix-1.3.x
Merge branch 'jelix-1.3.x' into jelix-1.4.x
set up cloudant account and adjusted couch documents for replication.. Replication does not seem to work properly, I will have to manually have document replicated.  Working on localStorage data.. Data is saving to localStorage, however, still unable to display data.. Autofill works great!!
Complete second scenario
preco no procedimento
added empty templates for mail
Changing Products Title as requested by Issue #1
Merge pull request #2 from jlstr/products-title-change

Changing Products Title as requested by Issue #1
Removed pseudo rest library from draft libraries.
Added WSF_ROUTER_ITEM to replace a structure represented with named TUPLE
Added debug_output to ease debugging
removed "rest" from readme.md
Include the `url' in the http client response.
This way, we can get the real url used by the lib, especially when there are query parameters.
minor change: reuse local variable
added some stuff
merge
Merge branch 'master' of github.com:johdirr/MTA
Revert "Remove cherry-pick2"

This reverts commit d9a7acc03f23bce069459f2b50b48bbddf9a7f4a.
Minor clean-up of SelinuxsecuritycontextAdapter, add retry to remote cache move, and edited a log message.
Fix test-fs-realpath on Windows

Also, in the process, fix a bug in fs.realpath on Windows.

If the user has permission to create symlinks, then use symlinks.  If
not, then skip over all the tests that cannot be run using Junctions
instead.
2012.07.09, Version 0.8.2 (Stable)

* npm: Upgrade to 1.1.36

* readline: don't use Function#call() (Nathan Rajlich)

* Code cleanup to pass 'use strict' (Jonas Westerlund)

* module: add filename to require() json errors (TJ Holowaychuk)

* readline: fix for unicode prompts (Tim Macfarlane)

* timers: fix handling of large timeouts (Ben Noordhuis)

* repl: fix passing an empty line inserting "undefined" into the buffer (Nathan Rajlich)

* repl: fix crashes when buffering command (Maciej Małecki)

* build: rename strict_aliasing to node_no_strict_aliasing (Ben Noordhuis)

* build: disable -fstrict-aliasing for any gcc < 4.6.0 (Ben Noordhuis)

* build: detect cc version with -dumpversion (Ben Noordhuis)

* build: handle output of localized gcc or clang (Ben Noordhuis)

* unix: fix memory corruption in freebsd.c (Ben Noordhuis)

* unix: fix 'zero handles, one request' busy loop (Ben Noordhuis)

* unix: fix busy loop on unexpected tcp message (Ben Noordhuis)

* unix: fix EINPROGRESS busy loop (Ben Noordhuis)
a funcionar online
Add "ruby" dir to mri19 -I flags.
bump versions for dev
Add comments about the limitations of our current io/console impl.
Quiet stderr while testing for stty support.
Improve io/console warning for platforms without stty or tty pass-through in JDK.
Mask newly failing test (due to io/console partial impl) from MRI suite.
ObjectSpace tweaks:

* Check config only once and choose ObjectSpacer impl. This
avoids boolean checks along object construction paths, and allows
ObjectSpace logic to boil down to an empy inlined method when
ObjectSpace is not enabled.

* Never follow ObjectSpace-aware constructor path for Floats.
Merge branch 'master' into post17
Add dexmaker jar for intellij.
Simplify recordCache
Rename ArrayUtils to EnumerableUtils
Merge pull request #287 from pivotal-medici/rename_array_utils

Rename ArrayUtils to EnumerableUtils
Sync mozdevice with mozilla-central
mozdevice's init file needs an extra import to be truly useful;r=ctalbert
bump version for pypi release
Import DMError in mozdevice namespace by default;r=jhammel
Bug 801119 - bump mozprocess version for bug 800674
Bug 801973 - Fix setup_development.py for versionless deps, r=jhammel
Bug 802652 - Add ability to specify custom marionette host for mozb2g;r=mdas
Bug 802670 - Fix up getFile in devicemanager;r=ahal
add materials & tasks
add course kinds & levels
メソッド名修正
文法ミス修正
fixed case where delete node did not delete the root node.
Add libssl-dev to build dependencies
Comment additions and reindent them.
cleaned up mailboxes and sketching out how the scheduling will work
Adding public var
Smaller font for submitted date
Display time & search/tags <titles> properly
1.修改世界地图，修改多语言合并遗留问题
Merge branch 'master' of 192.168.9.14:dhsgclient-x
Merge branch 'master' of 192.168.9.14:dhsgclient-x
fix count_all to use constant alpha rather than h
figure of vibrating drumhead
Merge branch 'master' of github.com:ktkonrad/qc
js
js
Merge branch 'master' of https://github.com/kundy/ghost
js
Add form for Settingtable
Changed Floating for Portfolio

Yay! Looks better mobile too, probably.
Updated doc string based on James review
Implemented verifyselect API, added getcombovalue API
Sinny 3'UTRs work with CacheTxDbTrack.

The "great" (sad) discovery is that for the basic/initial functionality I needed, I could have gotten by w/o the entirety of hacking the CacheTxDbTrack into Gviz.

We could just run the result of `buildCachedTxDb` into `GeneRegionTrack` and hacked the `Gviz-methods:::.boxes` function.
log file is now created automatically.
finished debugging stage 2, should be finished :)
Checking for device vendor files before beginning to build CM
jquery tutorials
Changed default controller and added form helper.
Removed htaccess swp file
Sign in / Sign out / Local Registration completed
Profile page changed, distinct admin page added and started.
Update pinyin table.
Propagate changes.
Accept visibility in push_state and push visibility state in class condition handlers

Fixes #551
wrote another test case for CommandHandler, switched responses on CommandHandler to use a promise pattern
Use percentage instead of width for assets creation.
adding jabberbot lib
updated step-interactions
Oscillatory wave tank problem working
[WIN32] added more logging
[WIN32] don't use libcdio to get the first optical drive (although libcdio uses the same technique behind).
changed: strFirstAvailDrive is a member variable so name it accordingly.
[AE][WASAPI] Fix missing S24NE3 in sink test formats - Fixes Trac #13200
pvr: fixed - certain gcc versions didn't like passing a ref to a temp object created in the parameter of a function call
pvr: removed dev leftover
pvr: set m_pLiveTV and m_pRecordable to NULL when deleting m_pFile in CDVDInputStreamPVRManager
[AE] Add AE::Suspend() / AE::Resume() to temporarily halt AE output for external players and power saving.
[AE] Add advanced setting <streamsilence>. If false (default) SoftAE will enter a suspend state if there are no playing streams or sounds.
[AE][SoftAE] Restore Eden behaviour by not streaming silence when no streams or sounds are actively playing. Unfortunately also restores Eden behaviour of losing a bit of audio at the start of a stream if the sink is re-started but thats another fix :)
[AE/CA] - implement suspend/resume for CoreAudio. We basically shutdown end initialise the whole engine (sounds and streams are beeing kept because they can be reused after resume - and sounds are hold in the guiaudiomanager so we can't just delete them on suspend)
[AE][SoftAE] Add platform-dependent defines for time new idle/suspend mode sleeps between checks for new streams.
[AE][CA][SoftAE] Add IsSuspended() so players know audio processing is suspended
[DVDPlayer] Support suspend/resume in DVDPlayerAudio.cpp by dropping packets while in suspend state so video keeps playing
[PAPlayer] Support suspend/resume in PAPlayer
Add Suspend/Resume to Python API - thx amet and jcarroll
[AE] - Make sure, that m_channelLayout is updated, when user has set too many channels.
Don't search for external subtitles when opening a LiveTv input stream.
This commit also modifies the check from 6 ifs to 1 if with a disjunctive condition.
[cosmetics] Remove commented lines of code.
revert DirectoryNodeOverview.cpp changes from 973831c
"videodb://" directory was empty after that commit, revert fixes it and so fixes empty upnp server video node
Added listeners for car volume changes
Extract keyboard automation code into its own KIFTypist class
Add a method to perform a long press
Merge pull request #141 from TestingWithFrank/pr/typist

Extract keyboard automation code into its own KIFTypist class
Merge master
Merge pull request #166 from percysnoodle/long_press_only

Add a step to perform a long press
see all dresses
create bigger assets
Modification of default field constructor to handle hidden input type
Better signature
v0.1.12
unified nbsocket and eventcount
Add a new wallpaper
Few improvements to poll and epoll, epoll still broken.
Add TestCase::assertCookieExists 

Unit test for Constraints\CookieExsists.
PROJECT: Tidy.
PAPER: Updates...
Fix a possible deadlock in MesosScheduler
Merge branch 'master' of github.com:mesos/spark
Allow controlling number of splits in distinct().
Use null as dummy value in distinct().
Merge pull request #227 from JoshRosen/fix/distinct_numsplits

Allow controlling number of splits in distinct().
Fixed GrowableAccumulatorParam.zero() to do a copy and to make sure it's
empty instead of using the old initialValue
Look for Kryo registrator using context class loader
More updates to docs, including tuning guide
Allow controlling number of splits in sortByKey.
Fix mis-displaying message for suite output being opened.
Merge pull request #152 from arjclark/bug03

Fix mis-displaying message for suite output being opened.
Add support for custom HTTP methods.
Starting work on the library.
Added ale interface file.
learn to spell resource.
current version updated
site link updated
Initial commit
add class for scrapping
modified scrap.rb
Merge branch 'master' of github.com:mierem/cjvr

Conflicts:
	README.md
bump to safe latest
Merge branch 'master-dev' into master-dev-tegra2

* master-dev:
  bump to safe latest
双11优化
exclude all of log4j dependencies
compiler source to 1.6
improve polygon class
Some macro fixes
Fix test_add_args_in_macro
Fix test_block_parameter_uses_outer_scope
Fix test_instance_macro_call
Start implementing hashes
Hash support
Re-enable hash_test.rb
maintenance
Merge branch 'master' of github.com:mjago/Emacs
* Update d/watch file.
  * Bump years for debian/* in d/copyright.
  * Update d/compat to '9'
  * Update debhelper to >= 9 in d/control
 Remove override_dh_auto_configure in d/rules.
Write system as XYZ file
style.css cleanup
update 3.0.10 to 3.0.11

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
fixed showing no 'Usage'.
mruby should accept "-" as stdin
mruby should read from stdin if no argument given as cruby does
Merge branch 'master' of github.com:mruby/mruby
added messaging adding / getting
added settings and background worker
Fixed version conflict
Added location loading.
cleaned up code in paging.c

Signed-off-by: Manohar Vanga <manohar.vanga@gmail.com>
check for is_active across various referral workflows
check for active contacts for people associated with referrals and mothers
Merge pull request #107 from mwana/dray-dev

Cleanup Tests
Merge branch 'zhcard_dev' into active-contacts
Merge pull request #106 from mwana/active-contacts

only send outbound notifications to active contacts
manual merge of dray-dev, resolves #108
Merge branch 'zhcard_dev' into dray-dev
SMS Users Overview Form
Add textile and markdown2 renderers.

Closes #76.
putty settings
lesser readme changes
	modified:   .nensha/etc/.config
rewrite and redirect with matches
css fiddling
version of new footer layout
major refactoring of html template and classes. client.js adapted and cleaned up.
Fix an issue in get file.
Remove autojump and local::lib from mac-env
code to free global objects and some other memory leaks in the graph access control component.
Fixed discover input sequence type bug.

Quorum::Sequence#discover_input_sequence_type failed to detect lowercase input
sequences correctly causing nucleic_acid sequences to be typed as
amino_acid. Fixed bug and updated specs.
Updated HISTORY.md
Updated Gems
Version bump v0.3.3
Updated Gemfile to v0.3.3
Merge branch 'master' into data_export
Update examples/ircbot.tdl
prepare sinatra, rspec, activerecord
Improve AioChannelFinder implementations

- Use copy-on-write map
- Fix a potential bug where the old implementation assumed that one 
  Runnable type always wraps the same Runnable
- Cache offset value instead of Field in UnsafeAioChannelFinder
Fix StackOverflowError in ChunkedWriteHandler; issue #620
Merge pull request #621 from losipiuk/3

Fix StackOverflowError in ChunkedWriteHandler; issue #620
[#539] Potential direct memory leak in HttpContentEn/Decoder
Add 64KiB test
some modifing
cassandra source code
working gnupg
Update themes config reader
2.1.1-2.1.2
Rename henshin to henshin_module

For the time being, rules transformation and rules application will be
in two separate parse transforms.
Setting UTF-8 encoding on reading from cache
Remove DEBUG-level logging and remove a test from test_all.
rel icon and some shortcuts help
changed language in the support mailto link
Merge branch 'master' of http://github.com/nyslabor/UX.git
Merge branch 'joyride' of github.com:nyslabor/UX into joyride
Merge branch 'joyride' of github.com:nyslabor/UX into joyride
joyride wording edits… added a final prompt
Intergrated link icons into development and setup documentation page for keith
Tweaked popovers page
Added blank page template
Created "Using the UX Template" section pages
Content added to "Using the UX Template" section.  Java/JSF page still needs content.
small test change
added content strategy pages and started removing php shorthands
enabling navigation for Getting Started
fixed development nav issue and added more content strategy pages.
Added the last of the content strategy pages
fixed last commit
"Getting Started" nav finished
fixed global menu and added dev index
nav fix
Accessibility page
Merge branch 'master' of http://github.com/nyslabor/UX
Overview nav fix
Added Syntax Highlighter into the development blank template and fixed existing pages. Added Standards Overview/HTML/CSS.
Added the last of the standards pages.
Added 3 more pages Structure Overview/Side Navigation/Internal Pages
Finished the Structure section. Started on the form layout section
Finished the form section
Stream.rotate(): Try to avoid half-rotated streams

Some basic checks are performed for all traces before the actual
rotation happens. This should help to avoid half rotated Streams.
fixing incorrect entry point for obspy.db features
Merge branch 'master' of https://github.com/obspy/obspy
obspy-indexer uses now # symbol for adding features
adding mapping file to HTML status of obspy-indexer
Fix for missing colour fill when line heights are different
Now reads test data from the server rather than directly fetching it
Implemented chunked text load from server to fill available space along with markup-aware text trimming.
Updated import tool to generate (quite a few) dummy semantic annotations. Renderer now produces elements for each of these and links them using a second canvas element to show the spatial relationship between annotations in the text and their corresponding summary elements
Added mock JSON data back into repository
Modify hook names. Ref #367
Adds background image for featured checkbox in the save panel.
Remove extra button from empty collections page, update add button class.
Removing API key management.

The Google Earth plugin no longer requires an API key.
added gitignore to empty sessions directory
hopefully fix segfaults
First commit
Merge branch 'master' of github.com:ov1d1u/roio
Updated Places views to use TransportService for RTI.
PoC add _self link on POI details.
Use double underscore to avoid tainting blizzard
Bump Interface version
Add connection for eval-string-in-frame tests
cannot use Inf index to assign or access element in infinite array, RT #73184
Add test for RT #115508
ObjectFactory changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/webapp/spec/xp/ObjectFactorySpec.js
Fixed bug #63377 (Segfault on output buffer)
Merge branch 'PHP-5.3' into PHP-5.4
preg indenpent test script for #63055
Merge branch 'PHP-5.3' into PHP-5.4
fix valgrind warning
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Fixed test bug #62312 (warnings changed one more time)
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning

Conflicts:
	ext/mysqlnd/mysqlnd.c
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
Fixed bug #62073

(Different ways of iterating over an SplMaxHeap result in in different keys)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
fix 5.3.10 tar name in releases file
fix RC variables (allowed values are string|false)
Add NIF implementation of lift_ii and lift_is.
Added Factions Integration

Integrated with the faction plguin. This allows leaders and moderators
of the faction to employ and fire other players within there faction.
update gitignore
BUG nimFlow spine not disabeled when emergy is computing
Merge branch 'master' of github.com:pigne/SCALE

* 'master' of github.com:pigne/SCALE:
  Update README.md
minor translation update 

git-svn-id: http://dev.piwik.org/svn/trunk@6742 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Fixes #3576, make sure ajaxHelper sets correct range date when using default parameter.


git-svn-id: http://dev.piwik.org/svn/trunk@7539 59fd770c-687e-43c8-a1e3-f5a4ff64c105
initial import
subprocess.py: ensure SIGPIPE is honored by sub-processes

This is a workaround for a nasty issue when using
the standard python subprocess module, or os.exec* etc.
in any version of python before 3.2
http://bugs.python.org/issue1652

It's disappointing that a simple patch was provided
to python for this important issue _5 years ago_ and
it's only made it into python 3.2, with not much chance
of upstream updating earlier releases.
*7994* Reference fixes
Fixed tests failing because others were closing db connection before them
admin page ajax error
mvc template component dirs
Makefile fix
Pushing additional documentation.
Added shoulda matchers and simple spec for presence validation for user attributes
Animator fix
Merge remote-tracking branch 'origin/master' into BitmapFont2D
removed fontScale
Merge remote-tracking branch 'origin/master' into BitmapFont2D
Merge remote-tracking branch 'origin/master' into BitmapFont2D
Merge remote-tracking branch 'origin/master' into BitmapFont2D
BitmapFont2D extends SmartSprite now
Merge commit '9aeec87041d93e4baf27b1c580614aea9694b376' into optimize
fixed bad url in readme
let's have MOAR admins to receive failure notifications
Fixing a string.
admin panel: fix news
admin panel: fix news
Alterado esquema de urls de certificado

Adicionado campo slug, a ser preenchido automaticamente
por string de 7 digítos, tornando url mais legível.

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

Signed-off-by: Fernando Rocha <fernandogrd@yahoo.com.br>
Apply new color scheme.
pyfes 2012.11 のざっくりとした構想案を追加する
Merge remote-tracking branch 'upstream/master'
Update version and manifest
Finish the sentence
Merge pull request #342 from s3u/master

Fix "Can't render headers after they are sent to the client"
change constants for components merging
Fix issue where PerItem calculator would fail on promotions that had rules which did not respond to the "products" method

Fixes #2322
Update core/app/views/spree/shared/_google_analytics.html.erb

If an error occurs during the final page of the checkout  - order_path(@order), this leaves the flash[:commerce_tracking] set. So when the user goes back to the home page or any subsequent page, the pages will throw an nil exception on <%= @order.number %> because the framework sees that the flash[:commerce_tracking] hasn't been cleared.

The fix is to also check that @order is present.

Fixes #2287
Merge pull request #5373 from nertzy/fix_comments_about_to_partial_path

Fix comments about to_partial_path
Fix typo
Merge pull request #6067 from Locke23rus/patch-2

Fix typo
Speed up mass assignment by avoiding extra loops.
Deprecate `:mouseover` options for `image_tag` helper.
Failing test for #6251
Fixes issue #6251

Plugin generator crashes when using the --dummy-path option

Code was assuming the application name in `config/application.rb`
was module Dummy.
Make DatabaseTasks a module with real private methods
Refactor Relation#update a bit to avoid an extra Enumerator instance
Add release date of Rails 3.2.9 to documentation
Merge pull request #8193 from claudiob/add_rails329_release_date

Add release date of Rails 3.2.9 to documentation [ci skip]
Split up the "Realisatie" chapter into multiple files
Split up the "Resterend" chapter into multiple files
Split up the chapter "Technisch ontwerp" into seperate files
Started trying to create a Feynman diagram
Changed a sentence structure
Changed "softwware" to "software"
Created the electron-photon Feynman diagram
Updated the Feynman diagram caption
Updated the PC schematic flowchart
Added the packages for the Feynman diagram
Created the Feynman Tikz set
Forced the airshower figure to be at the bottom of a page
Centered the program flow figure
Added a comment
Fixed the LabVIEW and PC schematic charts
Added some more Tikz libraries
Started working on the IPO schemas
Added all the IPO schemas
Uncommented the figure includes
Trying to fix the unbound method error I'm getting when I try to link the calc_all method to the GUI's button
Unit tests for CHtml::statefulForm(), CHtml::mailto(), CHtml::image().
[maven-release-plugin] prepare release ninja-0.5.1
Use better fonts for the menu arrow.
Better handling of quick mouse movements between submenus.
Add Y.Plugin.Menu.
Merge branch 'menu' into smugmug
Build menu and yui.
# spkg version 0.4

# add command
  // version
  // db-version
fix mouse event reuse
Extensive edits to all pages,  separated general parsing rules.

Moved Path & Querystring Parsing to separate file. Expanded on format
selection in Level 1 specification.
Escape html in build output
Merge pull request #44 from richo/features/escape_build_output

Escape html in build output
article_preview content|safe
initial
Merge branch 'master' of github.com:rlishtaba/c
Minimal working version of interaction tests
reverted
Merge branch 'master' of github.com:rnv/rnv.web
fixed wrong merged
Merge branch 'master' of github.com:rnv/rnv.web into 5446

Conflicts:
	src/rnv/web/setuphandlers.py
Use term instead of ansi-term
Услуги и деятельность -> Строительные и ремонтные услуги -> Cтроительно-монтажные работы
БО: Фикс установки параметров
Спорт, туризм, отдых -> Спортивные игры, виды спорта -> Зимний инвентарь - исправлены санки
Оборудование -> Строительное оборудование - проверяем детали поданных объявлений
Оборудование -> Строительное оборудование - правильный порядок заполнения полей
При создании премиума ждём 1 секунду, чтобы появилась кнопка Сохранить
Правильная цена при подаче объявления в рубрику "Собаки"
Компьютерная техника -> Комплектующие -> Видеокарты - облако тегов
баг 37177 пофикшен
Баг 37177 пофикшен
command-t plugin modified
Missed extend for eager_autoload
Merge pull request #7167 from route/missed_extend

Missed extend for eager_autoload
Added the external libraries dependencies for the initial build.
Update README.mdちょっと修正
bee-cache-inventory: avoid printing null pointer
bee-cache: print usage if no command was given
namespace 間違いを修正
one more up
no need to specify cpy snippet for cpp, the one defined in c will be
used by cpp file
Boost.CMake is gone; delete it.
Don't need the readme anymore
Add Boost.MPI dump
Strip empty XML elements
rewrite difference.sh in python
added threadpooling when reading imagefiles and fixed performance on showing another image
Added gc test
Raised libuv revision
use entry_points for the main script
read the version from __init__.py + update the licence version
gitignore
rename test gallery to sample/
move the themes dir into sigal/
update MANIFEST.in
importing sigal in setup has a drawback: If the package requires a dependency
before the dependency is installed the setup.py script will fail. Back to manual
version number.
simplify params to keep only one config_file
rename params to settings
bugfix
[run.ml/run_process] fix the exit of [run_process] in case of error so that :
- [command] continues the computation (as well as [commands])
- [read_command_output] stops the execution
[install/upgrade] fix the restoration of old configuration
Suppose that "o.3" is installed and it exists a binary named "o" in $opam/bin .
When the solver proposes to change from "o.3" to "o.2", the binary "o" was wrongly erased and not restored.

Note that "o.2" could also install a binary "o". Here, the difficulty is to restore back the correct binary "o" in $opam/bin that were installed before the [proceed_tochange] execution. Because [proceed_tochange] performs some side effects modifications on variable with [File.Env], one solution is to call it again with a recursive call.
Merge branch 'master' of github.com:OCamlPro/opam

Conflicts:
	src/client.ml
Fix #285

Do not get stuck in a broken state: we always try to fix the lock errors, it's better to be a bit unsafe but not stuck.
Fix library installation.
Fix update of git/rsync repositories.

This should fix #286
RST is harder than markdown.
Added branch-specific info to README.
removes pre-M4 compatibility stubs for the IDE
Merge pull request #754 from scalamacros/topic/removereflectcompat

removes pre-M4 compatibility stubs for the IDE
SI-6359 Deep prohibition of templates in value class

This seems to have been the intent of 95d532 / SI-5882.
Merge pull request #1300 from retronym/ticket/6359

SI-6359 Deep prohibition of templates in value class
添加pagecontroller的 Insert Update Delete Alert
给model/User.py添加cmd命令
添加 model/AdminUser.py
添加User的登录与注销功能
more cleanup and consistency checks vs beam 4.10.3 changes
fix extension detection bug. fix #154
removed a debug line...
Site updated at 2012-04-27 09:42:07 UTC
net test.inc
Properties screen finished
Merge branch 'master' of http://github.com/shadowpt/hs
Merge branch 'master' of github.com:Nesokas/hs
Initial collision with court
Merge branch 'master' of github.com:Nesokas/hs
Modify watch task to use chokidar
Fix 0 info message wrongly being shown
Don't sort alert dropdowns.
Bugfix: Unlock page had no content
Fixed update references after update to PrimeFaces 3.2
Added geolocation editor for pictures and headers
Click sets the map marker and zooms in
Fix h1/h2 in readme
Initial commit
sozdanie failov i papok
Merge branch 'master' of https://github.com/siga111/PFM
Added a SetAttribute action
Updated Attributes to use Traversable instead of Iterable
made column margin more explicit, to allow for custom top/bottom margins
Update src/common.d

Added my own any function. I’m gonna open an issue on dsource about why I did such a thing.
TCP Keepalive
IGNORE_EXISTING_SNAP
remove unneeded .DS_Store file
Added a method to clear the object to start fresh.
Merge branch 'master' of https://github.com/mojombo/grit into feature/basename
+ test blob.basename('.rb')
Merge branch 'feature/basename'
Code intending at "CClientScriptTest" has been fixed.
Method "CClientScript::registerMetaTag()" allows duplication of meta tags.
Doc comment for "CClientScript::registerMetaTag()" has been updated.
Issue #1351 has been added to CHANGELOG.
New feature: allow disabled checkboxes
Mention of issue #1351 has been updated at CHANGELOG.
Yii style
Bug #1351: CClientScript::registerMetaTag() now allows to register multiple meta tags with the same set of attributes
Enh #1369: Added CCheckBoxColumn::disabled that accepts PHP expression or anonymous function determining if checkbox for the row should be disabled
Fixed CButtonColumn::buttons doc
minor doc and code corrections for CCheckBoxColumn
Enh #1396: Add 'text/csv' mime-type for the 'csv' file extension in utils/mimeTypes.php, in accordance with RFC4180.
Merge pull request #1397 from rawtaz/1396-addCsvMimeType

Enh #1396: Add mime-type for CSV
Initial commit of the extended version of CHtml::value().
Addition to the extended version of CHtml::value().
Additions to the extended version of CHtml::value().
Documentation refinements to the extended version of CHtml::value(). [ci skip]
Refinement to the extended version of CHtml::value(). [ci skip]
Merge branch 'master' of git://github.com/yiisoft/yii into 1386-chtml-value

Conflicts:
	CHANGELOG
CHtml::value(): Better detection of the callable.
Merge pull request #1399 from resurtm/1386-chtml-value

Fixes #1386, alters #724: the second parameter of the CHtml::value() is able to accept anonymous function
final save before rewriting logic
prbz
layouts, hallo, various
merge
sublime
Convert the value to urllib.quote

This is needed when the env variable that needs to be set contain spaces, semi-colons, equal signs, etc. Will do the change in Dirac.py and JobWrapper.py
[api] Fix zones_controller_spec
Use number_to_currency when setting values for price + cost_price in admin/products/_form
Push some configuration down into check classes.
Generate rake task from check metadata.
Rename DEFAULTS to OPTIONS.
Rename files option to glob to match public interface.
Generate translator code from check metadata.
Merge remote branch 'origin/check-simplify'
nativesyntax "xml" is passed verbatim to ZOOM

Before leading xml would ALWAYS be mapped to just "xml". Now
xml can be used as is or augmented with other things, such as
charset.
Update test results for SOLR target again
per-field weight is part of "rank" attribute content

For example, rank="2 au 3" gives a rank factor of 3 for terms in
au=terms and a rank factor of 2 otherwise.
Revert "Update test results for SOLR target again"

This reverts commit c0bd4e74093cac71d7798a579642f96027b81148.
New service setting: ccldirective

which allows CCl directives to be set. Such as as names for
and, or, and-not operators.
record parameter checksum

which is an alternative to offset (which might change between
re-searches). The checksum is returned in the per-record part
in attribute checksum.
Different diagnostic for no record and given checksum
Move declaration
Document checksum facility
Document per-field ranking
Comment out description of "set" in service

which is not implemented yet.
Document ccldirective
More NEWS
Version 1.6.15
Added option to temporary disable upload
Set correct sensitivity to SSH Key file
Remove annoying slow notifications
Remember 3 last screenshots
Merge pull request #50 from stas/master

Mono icons
Merge remote-tracking branch 'zachtib/master'
Merge pull request #47 from iyonius/master

Solving few small issues
Updated imgur uplader to use API v.3
Fix a bug in URI-encoding of certain non-ASCII characters.

Oh how I hate C casting rules.
Improvements to del(foo).

del(foo,bar) is now very different from del(foo),del(bar).
See #37.
Fix for empty module
Update README.md
Changed docs version to 0.2
Merge pull request #367 from Cadair/0.2

Changed docs version to 0.2
Merge pull request #368 from sunpy/0.2

0.2
Add doctests for Function class.
Merge pull request #974 from miham/Function_doctest

Add doctest for Function class.
Modified: SPHINX DOCUMENTATION.
Modified the documentation to pass tests.
Minor edits.
Minor edits
Edits again.
More minor edits.
Backticks added.
Merge pull request #1499 from angadhn/Documentation

Sphinx documentation.

Added 'text book' matter and api on LagrangesMethod and new functions added through the summer.
昼までのModelがDBにアクセスできるようにした。
Merge branch 'master' of https://github.com/syupein/oct.git
AppTest Delete!
add conduit-server
add simple server
org-e-odt.el: Fix all compilation errors

Rearrange and rename for greater consistency and clarity.  More cleanups
will follow.
org-e-odt.el: Fix more compilation errors
[ui][input] Added DateInputDlgComponent.
[ui][components][manager] Updated ComponentManager in order to handle Keyup, FocusIn and FocusOut events.
[ui][input][password] Added Password component.
[ui][input][date] Changed the DateComponent's name and updated various fields.
[ui][input][password] Updated PasswordComponent as RevealingPassword component.
[ui][input][date] Updated DateComponent in order to pass fixjsstyle and gjsstyle checks.
[ui][input][date] Updated jsdocs and onFocusOut function.
[ui][input][password] Corrected the type for domMappings.
Merge pull request #127 from emreoztunc/logistration

DateInputDlgComponent
f
first import
working prototype
Fix variable name
Fix include; remove commented Imagick test; use simpler test for equality of files
Add jail.fstab to dump specified jail's fstab file
Make relationship definitions inheritable

Makes it so subclasses automatically inherit a copy of their
superclass' relationship metadata. This allows subclasses of a class
including Her::Model to work as expected.
Made multibyte default
Cleaned up methods in titon\utility\String
Added test cases for titon\utility\String
adding Locale-Maketext-Fuzzy-0.11
Replaced deprecated rebar options.
Merge branch 'dev' into rc
Prepare for 0.1.1
Tiny change for 0.1.1

Merge branch 'rc'
Fixed timedelta and release 0.1.2
Add python-dateutil in setup.
Fixed a bug in setup.
Prepare for dev.

Merge branch 'master' into dev
sliding windows(in memory) works
HORIE TOMOTOMO
miukejlrgi
change pagetitle on LTSS.html
Config.pm: cvs update 04 may
Read and serve the entire certificate chain, instead of just the main cert
version bump for oauth fix; 1.0.10 -> 1.0.11
Implemented tolerance alarm for plot values
lakeshore device config update
FIX: added logResults for Job and Pilot Commands
Ajustado modelo de convenio Recíproco.
* updated crash supply map for frozen theme
* fixed 'actor gets stuck' on +ice map
* cleanup in GridBox::isZero

* the original attempt with VectorEmpty is for floating point checks - this is using an epsilon. But in this case we are only checking for ints
* fix default image for sprite definition
Added Vector3 and typedef on float/int/double vectors
enable thread test
fix bug that thread rpc not works
report pos in failed uploads
uniq zerg sockets
added checkbox widget type
Fixed fatal documentation & package errors
update function removed
修改mac-autossh-privoxy排版错误;
Minor updates
Add mappings for tabularize and some window dimension settings
Add window maximize/restore mapping
Replace >= 1 with != 0 for clarity.
Wrap gsl_sf_clausen.
Simplify computation of derivatives of gsl_sf_bessel_i*_scaled, wrap gsl_sf_bessel_il_scaled.
Test and fix gsl_sf_bessel_il_scaled wrapper.
Do not use pickle for serialization in memcache, but JSON

We don't want to use pickle as it can execute arbitrary code.

JSON is safer. However, note that it supports serialization for only
some specific subset of object types; this should be enough for what we
need, though.

We ignore memcached values that are flagged as serialized with pickle,
to avoid any potential issues with a memcached server still having
cached values serialized with old code.

By default, json.load() will convert strings to unicode objects. We
likely prefer to have str objects, so a specific JSON decoder is used to
automatically convert to str.

Part of bug 1006414.

Change-Id: Id7d6d547b103b4f23ebf5be98b88f09ec6027ce4
add bit64 operations
the philosophy of ruby
kręcące się gwiazdki
change feature box  fontsize
Imported Upstream version 0.2.5
Imported Upstream version 0.2.5
Removed the submodules directive to try the subtree command.
Author Database Fixups
core: start to implement expressions
Downgrading spring version to 2.5.5.
Upgrading fastutil version.
added unit test
Adding CartesianGeoRecord
Adding Comparator for CartesianGeoRecords
bit interlace and de-bitinterlace (x,y,z,lucene_docid)
added interlaceToLong2 to handle the case when both the low and high order bits are long
removed added interlaceToLong2 to handle the case when both the low and high order bits are long, interlaceToLong is correct
unit test for CartesianGeoRecord
unit test for CartesianGeoRecord
Added serializer for cartesiangeorecord
Merge branch 'master' of https://github.com/shandets/bobo
.
Merge remote-tracking branch 'upstream/master'
Adding CartesianGeoRecordSerializer test and fixing bugs exposed in CartesianGeoRecord
Refactoring indexing to create CartesianGeoRecords;  Commented out BufferedGeoMergeTest temporarily so we can share code before I start refactoring merging
commit so I can pull changes made by another user
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/shandets/bobo
Merge branch 'master' of https://github.com/shandets/bobo
Update app/assets/javascripts/cocoon.js

Hi, how about this changes?

For example it will be usefull in Twitter Bootstrap Tabs http://twitter.github.com/bootstrap/javascript.html#tabs where needed to have unique tab and link names.
and later catch and modify it myself in application like

```
$("#cars").bind("cocoon:after-insert", function(event, data) {
  return alert($(data));
});
```
Remove utf8::downgrade step for URI in HTTP::Message::PSGI

Not necessary anymore as per fix in URI.pm at 1.59 version.
Set Host: header and HTTP_HOST based on $request->uri. Fixes #177
Merge pull request #274 from wreis/upgrade_uri_dep

Remove utf8::downgrade step for URI in HTTP::Message::PSGI
check defined
Merge branch 'master' of github.com:miyagawa/Plack
document the meaning of each AccessLog markup field, including block formats
Use ' instead of " for readability, and to avoid inadvertent interpolation of % characters
Merge pull request #278 from karenetheridge/topic/accesslog-docs

Documentation for AccessLog middleware format fields
wording improvements
use the same example in the OO example, for easier comparison
Merge pull request #279 from karenetheridge/topic/middleware_conditional_docs

Documentation for Middleware::Conditional
Skip FCGI tests on release
Merge branch 'master' of github.com:miyagawa/Plack
change conditions
Checking in changes prior to tagging of version 0.9987.

Changelog diff is:

diff --git a/Changes b/Changes
index ef951da..e910a90 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,15 @@ Revision history for Perl extension Plack

 Take a look at http://github.com/miyagawa/Plack/issues for the planned changes before 1.0 release.

+0.9987  Thu May 10 07:06:32 CEST 2012
+    [IMPROVEMENTS]
+        - Support streaming in AccessLog::Timed (Peter Makholm)
+        - Support streaming in ErrorDocument
+        - Removed UTF8 hack in HTTP::Message::PSGI. Depends on URI.pm 1.59 (wreis)
+        - Set Host headers correctly in HTTP::Message::PSGI #177
+        - Added documentation on supported %-flags in AccessLog (ether)
+        - Skip unnecessary tests on non-developer environment
+
 0.9986  Mon Mar 12 11:26:59 PDT 2012
     [IMPROVEMENTS]
         - Use I/O handles to FCGI::Request instead of global STDIN, STDOUT etc. (chansen)
Add .woff to Plack::MIME as 'application/font-woff' as per http://en.wikipedia.org/wiki/Internet_media_type
Merge pull request #286 from ranguard/master

Add .woff to Plack::MIME 
Host header needs to include port information too
Merge pull request #287 from doy/master

Host header needs to include non-default port information
Checking in changes prior to tagging of version 0.9988.

Changelog diff is:

diff --git a/Changes b/Changes
index e910a90..f87158c 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,10 @@ Revision history for Perl extension Plack

 Take a look at http://github.com/miyagawa/Plack/issues for the planned changes before 1.0 release.

+0.9988  Fri May 11 12:25:09 CEST 2012
+    [BUG FIXES]
+        - Fixes HTTP_HOST in HTTP::Message::PSGI #287 (doy)
+
 0.9987  Thu May 10 07:06:32 CEST 2012
     [IMPROVEMENTS]
         - Support streaming in AccessLog::Timed (Peter Makholm)
Refactoring server startup listener logic to use OSGi services

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@140635 a5903396-d722-0410-b921-86c7d4935375
Removing the sysouts. 



git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@133591 a5903396-d722-0410-b921-86c7d4935375
Fix inheritance of wxGridCellFloatEditor
obsolete imports removed
i18n catalogue added
use i18n:text instead
dump filtered config file
Better target-env filtering
Get name after filtering
remove the default element only if target environment matched
filter realm configuration fixed
wrong target env added as example
Merge branch 'target-env-realm'

Conflicts:
	src/core/java/org/wyona/yanel/core/map/RealmDefaultImpl.java
Use strict download order (PopGeo)
Merge branch 'master' of https://github.com/x3dom/x3dom
fix write sets
編集機能のファイル追加
add traditional chinese version of the project name's origin
Add node-static into dependency.
Spring3 JPA
modify prune output
   1. display counting object
   2. modify remove message, new format "rm <hash>"
Umstrukturierung der Dateien in gfx.
Erweiterung der gfx um eine erweiterte Rectangle und Sprite Klasse.
Add document for set_exit_trap_for option
added i/o folder
xlayouts pre-release
a new method added: Atk14Session::toArray()
[fix] oneToOne correctly works both ways now
#1101 better docs for CAssetManager::publish
Merge pull request #1152 from samdark/1101-docs-CAssetManager-publish

[ci skip] #1101 better docs for CAssetManager::publish
docs/guide/ja fixed bad links (removed unnecessary "ja/")
Merge branch 'master' into docs-ja
Merge pull request #1069 from softark/docs-ja

docs/guide/ja fixed bad links (removed unnecessary "ja/")
[ci skip]
removed old version and some more ui fixups