labofsahil/github-event-dataset-2012 huggingface dataset:
Send info about which file is being processed to STDOUT.
Additional info (algorithm used) sent to STDOUT when using SAIS - this is to be consistent with the output when BCR is used.
Merge pull request #1 from nathanseal/master

add a file with a database outline
Merge pull request #1 from papg/master

merge back
Grrr quotes
Fixed string interpolation some more
Merge pull request #454 from shamanas/strInterp

More string interpolation fixing! \o/
front-end for user show page
Remove tabs from zookeepr/lib/helpers.py
also easy by brute force, take quite long time.
Added a test suite to increase the coverage of keys_for method in KnownHosts class
namespaced Utils module
cleanup ruby log
make checking modules instantiable
add modules base class
removed all module
moved methods to CLI class
removed core ext duplicate
cleanup CLI
Checker modules refactor

* make modules accept list of modified files to check
* remove Utils module
common checking procedure
fixed pry regexp
extracted module name
halt if executable not found
simplified availability condition
Merge remote-tracking branch 'fork/master'

Conflicts:
	lib/checker/utils.rb
Merge remote-tracking branch 'fork/master'

Conflicts:
	lib/checker.rb
	lib/checker/cli/execute.rb
	lib/checker/modules/coffeescript.rb
	lib/checker/modules/haml.rb
	lib/checker/modules/pry.rb
	lib/checker/modules/ruby.rb
	lib/checker/modules/sass.rb
	lib/checker/utils.rb
fix rvm_command
Merge pull request #3 from pewniak747/master

couple of gem refactorings
WIP show markers popup
Merge branch 'master' of github.com:netmask/codebnb
SNMP UPS fetching script
trying to add folder support
limit footer buttons
Refactor all GetAlbumArtist to GetAlbumArtistString/GetAlbumArtistCredits
Change return type of GetAlbumArtist back to CStdString
Refactor all GetAlbumArtistString back to GetAlbumArtist()
- added .gitignore
- added examples directory
some validations
Merge branch 'master' of https://github.com/nloreti/tla_lex
Follow ajax functions refactored
Fix a problem with some regex.
added ideas for labs throughout the day
Fix firefox esc key problem.

On firefox, esc key make the websocket disconnected.
Turn on and off the chat view with 'enter' and 'esc'.

Now can turn on the chat view with 'enter', and
turn it off with 'esc' key input.
Tested with all modern browser except IE.
For better look, modify the chat button structure.
updated MarketSell.class.php
Updated various files with notes
remove .htaccess file for testing
Fixed bug when page with null icon could get "error page" siteicon
- also fixed deleting history entries
rework auth server starting process
rework demo server starting process
rework echo server starting process
add session manager to auth server
fix indention in demo server
use session manager in auth server
wip connect4
Make the autocompletion case sensitive.
works fine, but all lessons in 1 day
1.2.0 Beta1

1st working version in real tests
A little Saturday afternoon loving.
initial commit - wrappers for core services
Update descriptions.
Add Ms-PL notices.
Add strconcat and vstrconcat (for convenience).
update #164
Ignore ConfigurationDeploymentTest for now because it doesn't work on all containers
Merge pull request #46 from chkal/fix-broken-tests-2

Ignore ConfigurationDeploymentTest for now because it doesn't work on all containers
Caisse.
Merge branch 'master' of github.com:odalisk/odalisk

Conflicts:
	src/Odalisk/Entity/Dataset.php
	src/Odalisk/Scraper/Tools/Normalize/FormatNormalizer.php
new location of files because of maven structure
manage resources (especially the ones I do not want to share)
some intermediate work on #34
whatever eclipse and maven did here together.
add sections for solaris and added services
Added boot and package commands and made reference of sources.
Added tests for tomahawk.rsync
re-added the '^' I removed for testing
Using tinyforver by default, avoid sending message back to sender
Merge remote-tracking branch 'upstream/master'
Open up the gates and try to connect to address on EADDRNOTAVAIL
Response returned as JSON.
added tests' macros
change version to 0.0.5
with watch cycle
Merge branch 'develop'
added evasys managment
Revert "simplified secret example in readme", because it does not work this way. [skip ci]

This reverts commit b33c13cbd1c93a9f47ad2c13cd96508e1800e667.
sorry, now in the right directory
properly encode data in XML output (bnc#773641)
changes 1.6.27
[lcd_displays] tweak lcd skin coding.
[lcd_displays] more lcd skin tweaks, vu ultimo skin is now called 'skin_display255_no_picon.xml' or 'skin_display255_picon.xml', so sure you rename your custom skins you have in /etc/engima2 if you use them.
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	configure.ac
	data/Makefile.am
	skin.py
rx: Add the add_and_read function to our atomics

Add rx_atomic_add_and_read, which lets us get the new value out
of an atomic addition operation.

Change-Id: If74b1357390329b8c59042d3154491a103fe0d6c
Reviewed-on: http://gerrit.openafs.org/7974
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Windows: memory leak AFSInitPIOCtlDirectoryCB

In an error occurs during AFSInitPIOCtlDirectoryCB processing
the nonpaged pool allocation would be leaked.

Reviewed-on: http://gerrit.openafs.org/7809
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 6b0bc2f6ff6ffecb4dd158ba5d2021d46bad7da0)

Change-Id: I75f592e347aea821993eb334d0dba1675a86b92f
Reviewed-on: http://gerrit.openafs.org/7822
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: AFSCleanup calls AFSDeleteFcbExtents

When the hard link count of the file drops to zero, call
AFSDeleteFcbExtents() instead of AFSTearDownFcbExtents()
because the file has been deleted and the extents have been
implicitly released.

Reviewed-on: http://gerrit.openafs.org/8565
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit da6c8d57287392c0e7d0c512dab5bcf019421f81)

Change-Id: Ia62d717a3a5eec7b26da17894bc9906d625e0c8a
Reviewed-on: http://gerrit.openafs.org/8590
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Swob bugfixes; for ? in names specifically

It was discovered that uploading items with ? in their names (encoded
with %3F of course) made Swob fail in that it trimmed off everything
after the ? as if it were a query string.

Change-Id: Ie686db9a2177aafad2e77c307ffc3f446646fbb5
Update notes for submitted changes

* Added override for swift-init's KILL_WAIT
Fix two edge cases with Range: header

This fixes swob to handle "Range: bytes=-X" where X > len(content); ex.
"Range: bytes=-17" when the object has 10 bytes. Based on the RFC, the
range is satisfiable and all bytes should be returned.

It also fixes "Range: bytes=-0" to be, correctly, not satisfiable.  In
addition, this case's response has Content-Length: 0 and has a zero-byte
body.

It also fixes an existing regression in swob for the case
"Range: bytes=100-" for a body of length < 100 (Content-Length was
negative and the body was returned).

The relevant RFC is 2616, section 14.35.1.

Change-Id: Ib3dc672e083173eb970c10801283813623f26e0e
Merge "Fix two edge cases with Range: header"
Merge branch 'master' of gist.github.com:2828291
Adding gist location
Giant optimization with DFS.
done. links are translated to titles via google api.
migration added
fix datatables styles and other stuff
New format for settings pages
fixed settings pages style
country-language issues
Merge branch 'issue-tables-ocadmin' into develop
country locale fixed
fix language delete
Merge branch 'develop' of github.com:osclass/OSClass into develop
Merge branch 'countrylang' into develop
fix on upgrade-funcs.php
remove console.log from code
finishing touches of country-language issue. need testing
Merge branch 'develop' of github.com:osclass/OSClass into develop
Merge branch 'develop' into testing
autoconf_scrambled automatic when scam_support=1 and documentation fix
Enabled safemode for markdown
Added a link to Bootstrap.
Arreglo de las admin/categorias
Updating alert and removing unnecessary code
language change should work
added cookie support in requests
text entered

 - Created from SoSOL template
 - text entered

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2012;0042' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0042.xml) to 'papyri.info/ddbdp/sb;26;16417' (DDB_EpiDoc_XML/sb/sb.26/sb.26.16417.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/sb;26;16417'
corrected according to Berkes
overstrokes fine
Update revisionDesc

 - Vote - AcceptText - l. 1:  <#λ̄=30#> --->  <#¯λ¯=30#>
l. 2: ι ---> <#ι=10#>; <#λ̄=30#> --->  <#¯λ¯=30#>
l. 6: [.?].2[   ].1[.?] ---> [.?].2[.?].1[.?] (Lajos Berkes)
 - Vote - AcceptText - See Berkes' comments. I think that the overstrokes are correct. Check them. (James Cowey)
 - Finalized - Ready. (James Cowey)
add flowerpeckers
add warblers. add contributing page
add larks
DRY up templates. create header, footer
More unverbosification
Merge branch 'master' into next
User settings for word wrapping
Update the ch.Content usage on Controls family
Merge remote-tracking branch 'chico.guille/v1.0' into v1.0
Deprecate the ch.Uiobject and use ch.Object as ch.Widget.
ch.Content: Replace the .update() method with .configure()
Change conf.value for conf.num in Countdown
Merge remote-tracking branch 'chicollinares/v1.0' into v1.0
Removed ch.exports and it was renamed to ch
Added isArray() method
Fix bug: webc serve uses path as default port instead of 3000
Removed unused slots.
added the filtering and pagination for sandwiches#index based on category
Add logback.xml to maven plugin close #760
Changed getEmValue() to pull em value from a blank document (iframe injected via DOM), to get actual user stylesheet em value.
Browsers that support media queries use the user's stylesheet base font size, not the document's base font size, to calculate ems.
Modifica di testo
Bug 731539 - Provide URL to 64px icon in API
Use more flexible way of specifying icon URLs
Added reviewer incentive point awarding (bug 739429)
add pluralization to fix broken extraction
Add new marketplace dirs to extract
fix up Categories fields on Submit Details on Edit Listing developer pages
backend for financial data (bug 754965)
Merge branch 'squash'
fix stats cron test
fix mkt stats tests and remove unused url from stats
fix page truncation/gap on horizontal scroll (bug 757887)
some base b2g mobile stuff
mobile-friendly menu
disable ES tests again :'(
fix event types for promo slider arrows on desktop
do not let footer be insanely long
the receipt won't work, but lets stop issuing it anyway (bug check-purchase)
fix paginator buttons on My Submissions page (bug 758139)
let screenshot be removed on Edit App Details page (bug 758144)
skip past /ecosystem/ if you have apps (bug 757761)
cm-daily: switch p4wifi, p4vzw, p4tmo, p4 and p3 to cm-10.1
added html+json
annoying syntax errors.
corrigi um erro
Add time schedule
Change font color
Change Schedule
[artf577456]-Admin UI issues fix - add custom property for config template.
Modified the phresco config location to Phresco
Write Api for phresco plugin
[artf583198]--  Admin UI:Unable to update configuration template - fixed this issue.
add tvheadend-9999.ebuild and w_scan-20120525.ebuild

tvheadend-9999.ebuild in sabayon-distro overlay had a typo that prevents
tvheadend.initd to be installed. w_scan has been updated to the latest
version avilable
mod make setup
Rake task rodando spec
Merge pull request #1 from caike/master

Rake task p/ rodar specs
IE 10 compatibility with http headers instead of meta tags

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1410 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
elements in sharedtoolbar of wysiwyg is now are now floating and the toolbar is semi-transparent when not used

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1411 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
include templates in build
add symposion to requirements
Added excel export with chart
Changed template. Refector.
Refactor
Fixed thypo and removed ugly leading underscores on images anchors
Exclude whitespaces for username/password part
Travis haxxing
Rollback modification. This test works, but only on python 2.7 version.
Added link and explaination for coverage report
remove get_helpers() methods, refs #24
Merge pull request #44 from plone/remove_helpers

remove get_helpers() methods, refs #24
trying to fix RTD problems with pinning down egg versions in requirements.txt
RTD problems: try withouth lxml
generate pip requirements with buildout.dumprequirements
RTD: don't build lxml
restore makefile removed in 50808855
use `make` to generate the sphinx docs again

(this way they're automatically kept up to date)
clean up doc-related git ignores after 0c24594f
only ignore our own egg-info
sort git ignores
run the tests (and generate the docs) as the default `make` target

(this way you can get started by just `git clone` & `make`)
remove egg-info when "making clean"
Merge branch 'master' into ploneconf2012
Added implementation for revoke roles. Adjusted the tests to make everything cleaner.
Changed test to use localhost for CakeDB server.
Added junit dependencies into the repository.
Added an ignore file to ignore Java .class files and cake*.jar (cake driver build files).
fixed Ukrainian files typo in Makefile.am
incomplete Bulgarian translation
codeclean
Merge pull request #227 from pmprog/master

Custom Base Uncancellable
Merge pull request #226 from xanscale/master

code clean
Const-correct Target::getDistance()

The target object has no need to be non-const, so I've set it to const.
Make sure our difficulty starts at 0.

Enums are not supposed to have defined values besides enum2 = enum1 + 1.
So the starting value can be anything. Fixed it to 0 now, since that's kind of
assumed throughout the code.
Delay alien missions on UFO interception.

If the UFO is shot down (crashed or destroyed) the next wave is delayed.
Allow search of regions by location.

The code for this is in SavedGame instead of Ruleset, since we have many loops
that need the actual Region object.
Allow creating a BriefingState without a craft.

This must only happen when the mission type is STR_BASE_DEFENSE.
Added const version of SavedGame::getBases().

Having const getters allows better code generation.
Fix for BriefingState.

Base defenses don't have an XCOM craft. Don't count on the pointer be always
valid.
Implemented Retaliation missions.

- XCOM based are now properly detected by UFOs.
- Mission UFOs spawn correctly.
- If we have a target, the assault ship is spawned properly and attacks the
  base.
- Optional: You can have the aliens remember all detected bases, not just one
  per region. Just set 'aggressiveRetaliation' option to 'true'.

Missing:
- Base defenses are not used.
- Alien item level is always 0.

Differences from original game:
- You can't have another retaliation mission in the same region until final UFO
  lands. In original it appears you could have a new Retaliation in the zone as
  soon as the final Battleship spawned.
- You can only stop the retaliation if NO detected XCOM bases are in the region
  when the final Battleship tries to spawn, OR if the detected base is removed
  after it spawns, but before it lands. In original you could stop the mission
  if you removed the base at any time.
Initial Commit

adds the "Base Under Attack!" screen.
Call BaseDefense state as required.

I think that's everything.
Proper spawning of XCOM Base Defense missions.

Retaliation works until the Base Defense mission starts.
Proper Target management in UFOs.

We only want to delete our destination if it's a waypoint. The other types of
targets are now owned by the UFO.
Better code documentation.

Added documentation to code written for the alien missions.
Fixed mission delay on UFO interception.

We were adding a delay twice, changed the code to only delay in
AlienMission::ufoShotDown() and use the correct formula.
Assign unique ID to each active alien mission.

The [region, type] combination is not unique for alien supply missions. So just
use a unique ID for all missions.
added World and Shape classes
added index.html and css folder with twitter bootstrap
Merge branch 'master' of github.com:pokutnik/HacMan
Fullscreen support for Linux platform
kelkoo sh
#1869 take care of ST_AsBinary(unknown/text), ST_AsText(unknown/text) is not unique errors

git-svn-id: http://svn.osgeo.org/postgis/trunk@10737 b70326c6-7e19-0410-871a-916f4a2858ee
fix typo revision to previous commit in support of #1944

git-svn-id: http://svn.osgeo.org/postgis/trunk@10174 b70326c6-7e19-0410-871a-916f4a2858ee
(#2071) Lower-case the 'c' and 'sql' function declarations to support PgSQL 9.2


git-svn-id: http://svn.osgeo.org/postgis/branches/1.5@10612 b70326c6-7e19-0410-871a-916f4a2858ee
Version push for release of 1.5.7


git-svn-id: http://svn.osgeo.org/postgis/branches/1.5@10613 b70326c6-7e19-0410-871a-916f4a2858ee
Fix XML


git-svn-id: http://svn.osgeo.org/postgis/branches/1.5@10616 b70326c6-7e19-0410-871a-916f4a2858ee
near-finished demo of all aspects of GROUP BY with aggregate functions. i think all i am missing (besides potential refinements or optimizations) is processing of NULL values in a way that standard SQL prescribes
fleshed-retrieve
Fixed issue #66 - Fixed the F4 memory map to include CCM RAM.  https://github.com/texane/stlink/issues/66
bug solved with Qrray
Make 'keeping connection alive' optional.
Support for whois command

Asking for whois info is quite popular. This adds it to the server
and the client side.

Signed-off-by: Rohan Jain <crodjer@gmail.com>
Command store and better command handler

This doesn't add and functionality right now, but it can be used for
functionalities like autocomplete, help text.

Signed-off-by: Rohan Jain <crodjer@gmail.com>
Merge pull request #170 from crodjer/master

Better comand handling, whois command
Merge pull request #168 from noraesae/master

make 'keeping connection alive' optional
renormalise classifier scores...  but do not touch reverse prob p(s|t) , do not weigh this one either..
add missing bits, cleanup
bugfix version bump and very important copyright date update
Added basic Hyper-V support, modified nova-compute to have
os=none in the monkey patching, needs to be changed to do
OS level checking first.
reverting haf done profile while I deploy
Made folder names clickable as well as folder icon and background
[BUG #] Use the pre element's textContent instead of innerHTML to prevent unwanted character entity encoding
[BUG #5978] Firefox: Flicker effect on pages with tabs/toolbars 


* Tablet Support Layout Fixes.
* Resolved an older Toolbar Bug on Firefox.
All expression objects are now a clone of Expr; add is_lvalue method for any expr, make operator precedence parser check for lvalue for assignment ops (so that you can't do things like a * b = 15)
added semantic configuration
-lpoll must come before -lm (which pulls in the system poll implementation)
fix install target
fix install target
Merge pull request #871 from quickfur/joiner_inf_constraint

Fix joiner output for infinite range of ranges
fix install
use intrinsic ldexp
add some Win64 functionality
more Win64 math stuff
TH1 Praktikum 2 Aufgabe 1 eingecheckt
#10 - cleaning out obsolete code and data from Variable class
Fix deprecated configure.ac in project_gen. Fix trailing whitespaces function in vimrc
test bundle hinzugefügt
[maven-release-plugin] rollback the release of com.rsmart.nakamura.oipp.uxloader-wrap-1.3.0-rsmart
Removed actual network addresses and replaced them with placeholders.
sync com código da GUI da Isadora
Add Groonga::Context#ruby_encoding
grndump: support database that is created by old groonga

Old groonga has a problem that groonga doesn't set type to values of
vector. So we can't set correct encoding to the values. They are
always ASCII-8BIT encoding. It causes a problem on converting to
JSON. JSON requires UTF-8 string not ASCII-8BIT string.
dwight
Corrected visual editor
added typeahead functionality with interface to oncovis data
modified status
added parameter to oncovis anchor
fixed search results
hide modal on result click
corrected source label
merged from upstream master
Merge pull request #7 from hrovira/master

typeahead in search box
formatted
added routing for 2d distribution
add vq code
hbs templates to layout controls
add 2d distribution and app view
track isblogo image for now
Added tornado app to services
added docs to tornado service
Fixed filtering in tornado svc
Merge pull request #8 from ryanbressler/master

Tornado Webservice with fixed filtering
Styling updates on publisher
Util to load a .bit file and output it.
jtag can read in from monkey.
Fix various problems with the JTAG programing.  Flys now.
+ Initial Release Local to repository
Vernacular.Test/Vernacular.Tool: update build

Support NUnit in VS through NuGet, and fix build
warning by changing arch from x86 to any cpu.
Added buttons for movement back in.
doing apple fixed in a more robust way now
added in the styling to go with that last commit
fixed show stopper bug related to having multiple pagination views hanging around
styling for pagination
full out version bump
gh-pages branch change reflected in master
Correctly name puppetmaster class
Code cleanup.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9942 e93f8b46-1217-0410-a6f0-8f06a7374b81
Fixed that search results are escaped twice.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10185 e93f8b46-1217-0410-a6f0-8f06a7374b81
no link for many-to-many list
address Florian's comments
trying to find the right event to bind.
try pre-baked user
Cut and paste the v0.87 routes tab code

crude cut & paste, with support for default parameters commented out,
just to get us going.
Enable routes tab
first pass at factoring out the results of the Routes tab to a separate model.

Create a RouteModel, which will need to replace RouteInstance at some point.
This will also all need some shuffling around, some tests and some comments at
some point.
Fix types in ListOfRouteModelConverter

The result from GetRouteData should be a List<object[]>, not a
List<IEnumerable<object>
fix up route data support

I messed up the route data values before. this straightens it out a bit, but doesn't fix optional parameters.
Add support for generating class proxies to IProxyFactory.
Add Pipeline inspector which will intercept calls to Route.ProcessConstraint and record whether they matched or not.
Better serialization for constraint list
Fix serialization of UrlParameter.Optional
tweak to Message constructor to make testing easier
Fix NRE when httpContext is null
Update unit tests to pass.

Sadly they aren't as comprehensive as I would have liked :/
RouteInstance is dead, long live RouteModel.
Merge branch 'routes-rework2' into System.Web.Abstraction
Not starting NFS services until ip-up event.
autofs: Clean up service definition

* Unmount correctly before killing daemon
* Add option for specifying packages that should be available for daemon
* General clean up
Add support for nslcd (nss-pam-ldapd) as users.ldap.daemon option
Add nslcd (nss-pam-ldapd) uid and gid
give prudence some spending money
Rigby!
Use color in git clone reminder
RT2012 alike apps
Still problem with order, but robots move
merge changes
soulware new package
#798
adding MANIFEST.in so sdists from pypi install
Merge pull request #15 from smn/master

Add MANIFEST.in to include LICENSE and README files.
create suzhifeng
增加maven远程仓库

Signed-off-by: rodneytt at work <rodneytt@sina.com>
added filters for uglifyjs and uglifycss
Integrator attempt
added save buttons to settings_general_menu & settings_graphics_menu
comment on key skill menu list
Now, that actually works...
Instance-level `collectionPath` should duplicate class-level interface. Credit goes to @eLod. Fixes #17.
on testmerge
on master
Merge branch 'testmerge'

Conflicts:
	testsdl.cpp
new commit
add comments into make
add a sample for show text
add SDL_ttf.h to inc folder
Merge branch 'master' of https://github.com/roynwang/RStock
add show text function into client
add function to show text at the up left corner
Updated README to suggest command-line arguments for memory control.
moving Proj4 to be independent
handle file extensions better; fixes regression #126
Markdown filter.
Post preview.
Show recent posts.
adding Jeffrey Hellrung to Iterator entry in maintainers.txt

git-svn-id: http://svn.boost.org/svn/boost/trunk@78120 b8fc166d-592f-0410-95f2-cb63ce0dd405
Reorder HP aCC and g++ #ifdefs. Refs #7693.

git-svn-id: http://svn.boost.org/svn/boost/trunk@81348 b8fc166d-592f-0410-95f2-cb63ce0dd405
upload handler add
aegis: update to 4.24.3, disable parallel build, set license, use notes


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91652 d073be05-634f-4543-b044-5fe20cf6d1d6
ale: add pkgconfig dep


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91653 d073be05-634f-4543-b044-5fe20cf6d1d6
apt-rpm: add pkgconfig dep


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91654 d073be05-634f-4543-b044-5fe20cf6d1d6
argus-monitor: use correct case for configure.cmd


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91655 d073be05-634f-4543-b044-5fe20cf6d1d6
flac: Build with clang, fixes #31766


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91194 d073be05-634f-4543-b044-5fe20cf6d1d6
py*-chardet: unify


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100480 d073be05-634f-4543-b044-5fe20cf6d1d6
groovy: version upgrade to 2.0.6


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100731 d073be05-634f-4543-b044-5fe20cf6d1d6
linkchecker: fix destroot (#36977)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99836 d073be05-634f-4543-b044-5fe20cf6d1d6
tk: fix build on Leopard and older by not offering the quartz variant there (#37016)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99837 d073be05-634f-4543-b044-5fe20cf6d1d6
freeciv: update to 2.3.2


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92257 d073be05-634f-4543-b044-5fe20cf6d1d6
rtf2latex2e: whitespace changes; add modeline


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92258 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/buildbot{,-slave}: take maintainership


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92259 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/buildbot(,-slave}: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92260 d073be05-634f-4543-b044-5fe20cf6d1d6
python/py27-sqlalchemy-migrate: update to 0.7.2


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92261 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/buildbot{,-slave}: update to 0.8.6p1


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92262 d073be05-634f-4543-b044-5fe20cf6d1d6
rtf2latex2e: update to 2.0.0, which no longer needs patches, thereby fixing patch failure (#30156); rewrite master_sites to avoid redirects


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92263 d073be05-634f-4543-b044-5fe20cf6d1d6
libdbi-drivers: fix cflags (#34123) and homepage


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96594 d073be05-634f-4543-b044-5fe20cf6d1d6
strigi: add exiv2 dependency because it opportunistically links with libexiv2


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96843 d073be05-634f-4543-b044-5fe20cf6d1d6
curl-ca-bundle: fix fetch failure (#36676)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98930 d073be05-634f-4543-b044-5fe20cf6d1d6
g-wrap: fix invalid license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98931 d073be05-634f-4543-b044-5fe20cf6d1d6
ice-cpp: support clang++ and g++ 4.7.x plus other fixes.  Closes #33478.

The patch to the port was downloaded from the following URLs (they are
identical):

  https://trac.macports.org/raw-attachment/ticket/33478/patch-ice-cpp-clang.diff
  http://www.zeroc.com/forums/attachments/patches/974d1330952903-patch-compiling-ice-clang-gcc4-7-patch.ice-cpp.macports.txt


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94742 d073be05-634f-4543-b044-5fe20cf6d1d6
gcc*: Use our cctools and ld64 for assembly and linking


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92064 d073be05-634f-4543-b044-5fe20cf6d1d6
python31, py31-gdbm, py31-tkinter: update to 3.1.5 (#34007)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92080 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/avr-gcc:
Whitespace/tab fix


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90920 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/avr-gcc:
bump to 4.6.3


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90921 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-gcc:
Added some more patches, bumped the rev to force rebuild.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90922 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-binutils:
Updated to use better patch URLs


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90923 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-libc:
Updated paths to use the sourceforge: form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90924 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430mcu
Updated to use sourceforge: path form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90925 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-gdb:
Updated to use sourceforge: path form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90926 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-libc-devel:
Bumped to 20120311
Uses sourceforge: path form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90927 d073be05-634f-4543-b044-5fe20cf6d1d6
openssl: enable 'asm' (all tests pass on 10.7/x64); inc. revision;


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90928 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430mcu-devel:
Bumped to 20120311
Uses sourceforge: path form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90929 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-gdb-devel:
Uses sourceforge: path form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90930 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-binutils-devel:
Bumped to version 20120224


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90931 d073be05-634f-4543-b044-5fe20cf6d1d6
cross/msp430-gcc-devel:
Bumped to version 20120311
Uses sourceforge: path form


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90932 d073be05-634f-4543-b044-5fe20cf6d1d6
yaws: update to version 1.95


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98839 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/apiextractor: remove self from maintainers. Code appears to be abandonned: URL redirects somewhere else, pyside no longer needs it


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98840 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/generatorrunner: remove self from maintainers. Code appears to be abandonned: URL redirects somewhere else, pyside no longer needs it


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98841 d073be05-634f-4543-b044-5fe20cf6d1d6
py-pyside: update homepage, livecheck.url


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98842 d073be05-634f-4543-b044-5fe20cf6d1d6
py-shiboken: update homepage, livecheck.url


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98843 d073be05-634f-4543-b044-5fe20cf6d1d6
py-pyside-tools: update homepage, livecheck.url


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98844 d073be05-634f-4543-b044-5fe20cf6d1d6
Revert JSON changes to PHP 5.3

This reverts the following commits:

974324676b2436f159f42d9241c569f813471684
4662151ea7d7b6920d115cf2a2d6e9d4232727a3
84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f

This does not revert the JSON changes released in PHP 5.3.14.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Revert JSON changes to PHP 5.3
Revert JSON merges to 5.4

This reverts the following merge commits (-m 1):

405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab332366a202f0a709279a2466a
Merge branch 'PHP-5.4'

* PHP-5.4:
  Revert JSON merges to 5.4
  Revert JSON changes to PHP 5.3
Fix accidential change of php_version.h

For some reason the merge reverts changed the version :/
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix accidential change of php_version.h
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails

There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
Fix bug 61713 check also that mbstring's found any internal_encoding
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61713 check also that mbstring's found any internal_encoding
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61713 check also that mbstring's found any internal_encoding
updated NEWS
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated NEWS
Merge branch 'PHP-5.4'

* PHP-5.4:
  updated NEWS
constify
Merge branch 'master' of ssh://git.php.net/php-src
fix test
layer data decoding
Laying out default directory structure.
Revert "Reverted unwanted commits"

This reverts commit 4353347be7ccebe3909fb73930776b89304c82b1.
- Removing reference code.
vfrReader - added framework dependencies
add back commit hash for vfrReader
New spec: AQGridView
update SSPullToRefresh to version 1.0.1
Add ClassMapper 0.0.1
AQGridView: QuartzCore added to required frameworks
Merge remote-tracking branch 'samsoffes/master'

Conflicts:
	SSPullToRefresh/1.0.1/SSPullToRefresh.podspeci
[#197]
minor changes in spec
Add AKTabBarController 0.1.0 and 0.2.0
Adding DCKeyValueObjectMapping 1.0.0
Merge pull request #201 from samsoffes/master

Add SSToolkit 1.0.0
add iPhoneMK 0.0.1
Fix FrameAccessor. wasn't working at all (wrong source_files statement)
Merge pull request #199 from alikaragoz/master

Add AKTabBarController 0.1.0 and 0.2.0
Merge pull request #198 from garnett/aa82f6fda4773bc21066a749fde3b80fd9336ff9

AQGridView: QuartzCore was added to required frameworks
Changing source_files to include only .h and .m files.
Clean path: added project files; optional description was deleted
Unnecessary recursive copying of sources fixed ('classes was double mentioned in sources')
ARC required flag was set to true
Merge pull request #203 from garnett/master

IMPORTANT: ARC support set to required, duplicating of the sources fixed
don't commit .env file

This is a file that holds the env vars for heroku (or anywhere really)
initial code for preferences
Changed message on empty window
Implemented updatebox. Improved images path/loading
Implemented status menu (left view conversation)
Improved update box layout
Escaped characters in URL that offend Pango
Improved status layout. Added new images for marks
Fixed avatar align in status widget
Implemented delete status feature
With the abstract
design modification to empty message dashboard
s3 dir stuff
first placeholder implementation for Nietzsche to work on
Filled out README and uncommented pre-process code
More lang-strings.
Allow existing db connection to be used
Pass options to Store.put
SCUMM: Add support for Indy4 Mac 68k sound
SCI: Added another French version of Torin's Passage

Thanks to LePhilousophe for providing the file details.
Also fixed all of the detection entries for Torin's Passage
SCI: Return the default value for unknown configuration settings

Based on a patch by LePhilousophe
SCI: Add support for variable selectors in kListFirstTrue / kListAllTrue

This is used by Torin's Passage (e.g. when trying to open the menu).
Based on a slightly modified patch by LePhilousophe
COMMON: Fixes for compiling without USE_BINK enabled.

The math utility classes in Common are now used by more than just Bink
Video i.e. Huffman is used by SVQ1, RDFT by QDM2 etc. so need to remove
conditional inclusion of objects in the Common Library.

This was done as these functions are very large wrt. binary size.
This is mainly due to the sine, cosine and log tables which should be
reconsidered as to whether these are needed or can be replaced by
standard sin()/cos() calls.
WINCE: Fix shadow variable warnings associated with GUIElement classes.
Added field for bomb image
Fixed makefile for mac.
Add mocha and make it work
Adding Grunt to the toolbox
Implementation of Link Grammar for POS tagged indexing in termgenerator.
Update lib/Doctrine/Common/Collections/ArrayCollection.php

It is very useful to get back the element that matched
add class Visitor in views
ppt模板演示
Add global gitignore
Remove Terminal plist
njord.py keeps a reference to all class objects for each model when starting up.
Major changes made.  NjordModel now has class methods such as find and where that are capable of finding and creating instances of submodel objects.  DBControl class has had its SQL greatly inhanced to work with that.
Added all_records class method to the NjordModel class for return all records of a type.  Added an __init__ method to NjordModel so any new model created will have all its attributes and they will be set to None.  find_all method added to DBControl to handle the actual querying of the database for all_records.
Loading controllers.  Added a list for things to ignore for both models and controllers.  MODEL_IGNORE and CONTROLLER_IGNORE.
I need sleep
Initial Commit
Merge branch 'master' of github.com:shaunhey/VSTest
Another example that cannot use noremap. Set statusline red so it is easier to see active window.

More shortcuts
- add/remove focus: true
- window nav
change the statistics:
1. change bytesBeforeDeflate to headerBytesBeforeDeflate;change
bytesAfterDeflate to headerBytesAfterDeflate: these just record the
header bytes things.
2. add totalBytesSent to recond the sum of bytes send by browser and
server.
3. change deflateRatioVec to headerDeflateRatioVec; add
totalDeflateRatioVec; now can record the deflate ratio for both header
and the total message.
the harparser can parse har file for both http and spdy ( spdy is added)
this can be set by profile file which name is protocol.txt
add for harparser to get protocol this run use.
Hide navbar bottom in tablets and mobile
removing ugly merge mistake
Updates project architecture to armv7.
move link to actions
Merge branch 'master' of github.com:siddick/siddick

Conflicts:
	app/views/user/registrations/new.html.erb
	app/views/user/sessions/new.html.erb
- Reduce number of function calls
- Avoid module attribute access
- Optimize by calling tick() only once if timestamp is None.
- Avoid another call to tick when rescaling.
- Use timestamp as tick if provided
Speed up update() by avoiding attribute access where possible [r=lucio]
standardize comments
standardize comments
Enable overflow in iframe to make FF show vertical scrollbars
Using ProcessBuilder rather than doing it manually.
GUI mit Grunddaten der Moderatoren
Bug fix in recursion.
minimal changes to english texts to fit text in tabs also with Gear Lending
Few small tweaks.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
And that concludes why gates only blocked destruction of some fences.
Add a wicd Openbox binding.
Flesh out the README more.
fixed missing methods when in dce mode.
browser-vacuum: major rewrite
Add EADD server processing.
Fixed some stuff.
Popup.
changed general.css
making things dynamic
working more on index.php, adding attributes.
added DEMO
Restore periodicalEvent function
* and typo fixes
Fixed so Shift-Tab functionality works properly.
Merge pull request #32 from kilouco/master

Shift-Tab
Now Soul Points are shown in the bottom of the HealthBar widget.
Merge pull request #33 from kilouco/master

Soul Points
Merge remote-tracking branch 'upstream/master'
Invoked 'rails new hirefan'
Invoked 'rails generate scaffold organization name:string'
Added test related gems.
Run db migaration for Organizations table. Pointed Root to organization#index.
Added landing page.
Added employees. Added bootstrap.css.
Don't try to kill main greenlets

Main greenlets can only be deallocated when their
thread is gone, so trying to kill it will only
cause a leak. Only checking for run_info is not
enough, because deallocation path might not have
involved tp_clear.
Clear greenlet weakrefs first

Otherwise user code may resurrect greenlet when
it is already destroyed, making references to
freed objects possible (see the test case).
アイコンとスプラッシュつくった。ダサいけど。
Modified swizak-latest.rar
修改滚动图
Migrated UrlContext, HtmlEncode/decode, UrlEncode/decode from fubucore
First steps to scaling in ImageDecodingCache instead of FastImageItem

Partially functional.
Store the original image size in File

Having this around can be very useful (such as for the folder layout),
and ultimately makes more sense than keeping it with decoded images.
Implement pendingData for FastImage
Clean up scale/request parameters and usage
Update scaling requests on a delay to coalesce changes

This avoids issues when widget parameters are changed temporarily
(as seen with flickering on FolderLayout big items), and avoids a
massive amount of starting/stopping requests during interactive
resize.
Tweaks to scaled drawing in FastImage
Implement interim visible data for FastImage

This improves the overall request and data handling both in the
cache and in FastImage, and allows inline-scaled displaying of the
best version of a file that is immediately available while a request
is pending.
Superset testing for CachedImage requests
Fixing issue installing bundles on XP installer
Fix symlink check bug in dotfiles backup.
Merge pull request #161 from kevinwaddle/3.0

Fix symlink check bug in dotfiles backup.
fixed wrong options in wizards (-X/-W)
fixed wrong attributes var in createPosixUser
add primaryGroup entry to grou p in createPosixUser
renamed sambaAccountFlags to sambAcctFlags to correspond with ldap entry
added -Y --accountEnabled option (to enable a disabled account)
fixup bash completion stuff
Implementerte skyer!
Add .htaccess file to Spotweb directory with default mod_rewrite configuration ready to use to use Spotweb asa newznab api provider. Only works when the Apache modulemod_rewrite is added
adding Todo#toggleDone
Remove flup from the Gentoo package requirements

It is not required to emerge flup on Gentoo as it will be installed into the local Python directory by the "bin/easy_install flup" step.
update tmarc.xsl
update yaz/pazpar2 to latest releases
improve extraction of parent-id

now consider fields 773/800/810/830 $w.
fixed dogmatic mode exit
increased quest xp reward, corrected typo preventing minion resurrection, lives added to settings as a permanently limited resource
add sitemap url to robots.txt
Added docs + partial USB support
moved tzone into its own module
make drone_id a unique key
include object and storage id for debug
whoa, typo
the bfq patch level.....
Wed Oct  3 08:39:40 CST 2012
NP check and formatting
Merge branch 'develop' of github.com:structr/structr into develop
some stability improvements when same element is contained in a page multiple times
first stub for complex search queries
Merge branch 'develop' of github.com:structr/structr into develop
todo comment rechecking, code clean
setup.py didn't manage to detect the location of itself

 * needed os.path.realpath to get full directory path
Intigrating the model into the view (sry, no clean work)
Working install
Working version
item.rb: added collection() method to return first Collection
installs devise
generates devise model User
creates db table for users with email changed to username and column type added
added users controller, authorizations for managing users, fixed small markup bugs. added default avatars
updated links to blog, added twitter widget
答辩前 完成版本
单个线程完毕
单个线程，爬取完毕 not include DNS buffer
Add faqs and sample post
Site updated at 2012-06-12 23:34:22 UTC
Add scale_up option
read_meshtal.py now supports meshtal files with multiple tallies and also single energy group tallies
[unit] Added C#, C# unsafe and Java to the unit tests. They should build automatically with javac and mono or VS

git-svn-id: http://haxe.googlecode.com/svn/trunk@5158 f16182fa-f095-11de-8f43-4547254af6c6
fixed hash for 64 bits

git-svn-id: http://haxe.googlecode.com/svn/trunk@4810 f16182fa-f095-11de-8f43-4547254af6c6
[java] Report correctly when method is not found

git-svn-id: http://haxe.googlecode.com/svn/trunk@4992 f16182fa-f095-11de-8f43-4547254af6c6
Updated Russian translation for web-page

git-svn-id: https://vmpk.svn.sourceforge.net/svnroot/vmpk@370 64c129e3-8119-4a17-9932-72cb407d3134
added environment config settings
concealed additional changes to sublime-settings
finish multi-thread policy, and accordingly add assignment operators to wrapper, wig
Debugging through file_reader_intf.cpp, and add thread_pool.cpp
thread_pool.cpp encounters malloc error
Provide thread_pool.hpp and file_reader_intf.hpp
Simple test passed
Merge branch 'master' of github.com:swimnose/parser
clear Fisher's version
Merge branch 'master' of github.com:swimnose/parser

Conflicts:
	src/.DS_Store
	src/constant_def.hpp
	src/file_reader.hpp
	src/format/fasta_reader.hpp
	unit_test/file_generator.hpp